1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-09 16:18:45 +01:00

263 Commits

Author SHA1 Message Date
Android Build Merger (Role)
bb38f901b4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c
Change-Id: I436c96743da8a703d0828ff33e955ea0e0ff3766
2018-02-01 17:30:10 +00:00
Android Build Merger (Role)
233344c45c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad
Change-Id: I07f7c08f0864cb673c9c8ebc98a58d3a5414ee62
2018-02-01 17:30:09 +00:00
Android Build Merger (Role)
464c4336ad [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9
Change-Id: I36f8ec554ac96cdef4669809c8923b4f8b56768b
2018-02-01 17:30:08 +00:00
Android Build Merger (Role)
bd4b66c1a9 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c
Change-Id: Ibed017aec202e84aade79f805866c7102bdffa03
2018-02-01 17:30:07 +00:00
Android Build Merger (Role)
0bbb81398c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76
Change-Id: I50bab67ba74e6892895a9ad7aae4dc221f03ad89
2018-02-01 17:30:05 +00:00
Android Build Merger (Role)
46ead43c76 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d
Change-Id: I06431e0b18182521b2decfac9a890b3f61cd5593
2018-02-01 17:30:04 +00:00
Android Build Merger (Role)
81ea4ba91d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937
Change-Id: I3ad03691188f287aaea76280aaafc2485fe66a75
2018-02-01 17:30:03 +00:00
Android Build Merger (Role)
c48482d937 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05
Change-Id: I75bccc4690579a56ec343b735e94d54bbd780e92
2018-02-01 17:30:02 +00:00
Android Build Merger (Role)
99f3e5ce05 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12
Change-Id: I6afb07170037b0e27738cbe7e53dc3d733fbd874
2018-02-01 17:30:01 +00:00
Jean-Michel Trivi
08ae2e8d12 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-02-01 17:29:49 +00:00
Jean-Michel Trivi
378e6c244a Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev
* changes:
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 skipped: 490995c3c4
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e
  DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
2018-02-01 17:27:43 +00:00
Android Build Merger (Role)
6cad71f03e [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 skipped: 490995c3c4
Change-Id: Ia2560855c28b283d7491e75de27944e4cd6d27f7
2018-01-31 19:48:45 +00:00
Android Build Merger (Role)
490995c3c4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38
Change-Id: I54012703d606d0a5eb113ee109fc5ec87204bb6a
2018-01-31 19:48:44 +00:00
Android Build Merger (Role)
5e8b2b0a38 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c
Change-Id: I528d8dccae1e59c965dc4fcfae65ace1181886c6
2018-01-31 19:48:39 +00:00
Android Build Merger (Role)
e94aa9aa3c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454
Change-Id: I22ec8d38c1303f98be7f21e6ecce3bcb42ee7e61
2018-01-31 19:48:37 +00:00
Android Build Merger (Role)
1296b91454 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3
Change-Id: I7899630b98b1a7a1c8de7559aaaf9bc44a250c66
2018-01-31 19:48:36 +00:00
Android Build Merger (Role)
14728790d3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05
Change-Id: Ie400d21f7fefabed6c91b4b04880bd80e6153b20
2018-01-31 19:48:35 +00:00
Android Build Merger (Role)
b2d0afac05 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489
Change-Id: I14943f95747e93f1e85cf560fe63fa11b168c9e3
2018-01-31 19:48:34 +00:00
Android Build Merger (Role)
4523eae489 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768
Change-Id: I41f5e9a24af3c7a979c628df1be114185e02a8f7
2018-01-31 19:48:33 +00:00
Android Build Merger (Role)
6dd431c768 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945
Change-Id: I9d3b87e62af0f54c01ced2e3aac41fa8e96cb056
2018-01-31 19:48:31 +00:00
Android Build Merger (Role)
adc8026945 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e
Change-Id: If7874381cdfce6cced128082b35cbd6ab21f709d
2018-01-31 19:48:30 +00:00
Jean-Michel Trivi
8415da3381 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-01-13 01:29:19 +00:00
Jean-Michel Trivi
4a54666f3e DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-01-13 00:53:27 +00:00
Jean-Michel Trivi
47a6f5a741 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b
am: ee5b524516  -s ours

Change-Id: Ied7799fd88769b44cbe09b5e12df20f2f9670d50
2017-11-03 19:36:12 +00:00
Jean-Michel Trivi
117691fe59 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380 am: 902decfc99 am: 77aac03fb6
am: 5a2ae5cc27

Change-Id: Id4cceec7b64a1281bb922b76471f1bad7f283497
2017-11-03 19:36:01 +00:00
Jean-Michel Trivi
7517e7cd48 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17 am: 0c25940e1c am: a9a123b2fb
am: 083f093d1b  -s ours

Change-Id: I9f6da4a5c1377badab19374ef20ce7afde3321a2
2017-11-03 19:35:48 +00:00
Jean-Michel Trivi
6f71724cd7 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 am: 849c9b161a
am: e8c8539070  -s ours

Change-Id: Idafc9e6351b9590bda06fca836540efb4fb45246
2017-11-03 19:35:36 +00:00
Jean-Michel Trivi
ee5b524516 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f
am: c9026ad89b

Change-Id: Iba53050b91367ad11b29263f66d3e51236508a16
2017-11-03 19:33:14 +00:00
Jean-Michel Trivi
5a2ae5cc27 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380 am: 902decfc99
am: 77aac03fb6

Change-Id: I513fd4f92c93ece5fae4bc4db29eb442e951be92
2017-11-03 19:33:03 +00:00
Jean-Michel Trivi
083f093d1b DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17 am: 0c25940e1c
am: a9a123b2fb

Change-Id: I11f93ad48d89bef4647b9d7c081660765330d78c
2017-11-03 19:32:52 +00:00
Jean-Michel Trivi
e8c8539070 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0
am: 849c9b161a

Change-Id: I2b195f437bad5f77e48f6f8dce56542633f7d30b
2017-11-03 19:32:37 +00:00
Jean-Michel Trivi
c9026ad89b Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6
am: fb4d8cc62f

Change-Id: Ie726294fece52e3587d2942d5b7442eefad125b1
2017-11-03 19:28:52 +00:00
Jean-Michel Trivi
77aac03fb6 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380
am: 902decfc99

Change-Id: I04632c3154dddc9c6b7b80d4f3393dc20194dd27
2017-11-03 19:28:41 +00:00
Jean-Michel Trivi
a9a123b2fb DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17
am: 0c25940e1c

Change-Id: I599488f38c5b080533988d48edc0ee1df80c9da9
2017-11-03 19:28:29 +00:00
Jean-Michel Trivi
849c9b161a DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634
am: c7048181c0

Change-Id: I7d1de9b9cf9e03a03d27b5f5fd89eb08ff12f280
2017-11-03 19:28:08 +00:00
Jean-Michel Trivi
fb4d8cc62f Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993
am: ad2e179de6

Change-Id: I29f8bb0bb8accc369636d8d8726f7b505ce081d2
2017-11-03 19:25:38 +00:00
Jean-Michel Trivi
902decfc99 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb
am: e6b649a380

Change-Id: I54610df83d3e84021bd71e81c2f910545908c986
2017-11-03 19:25:27 +00:00
Jean-Michel Trivi
0c25940e1c DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce
am: 67a321cd17

Change-Id: I07c673dbbdab32f515bbefb52bd4495c83664ccf
2017-11-03 19:25:17 +00:00
Jean-Michel Trivi
c7048181c0 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8
am: a8eba4b634

Change-Id: I7c719af7670774f2db0f01d8a97199d4b3889be4
2017-11-03 19:25:05 +00:00
Jean-Michel Trivi
ad2e179de6 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours
am: 41363eb993

Change-Id: Ia506184ac99982b5602daccfa0ef2471965ef99a
2017-11-03 19:21:42 +00:00
Jean-Michel Trivi
e6b649a380 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97
am: 06c27a9feb

Change-Id: Id5bfc33a815aec69a302b5ba1460ad2d556c9179
2017-11-03 19:21:31 +00:00
Jean-Michel Trivi
b9d122614f DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 am: 3e28ad2039 am: d948041971
am: 73d49a121c  -s ours

Change-Id: I06a83a28b5a843bcd7865edc8f148b6fb1b0f649
2017-11-03 19:21:19 +00:00
Jean-Michel Trivi
67a321cd17 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours
am: 724b40ccce

Change-Id: Ia566e7de7c215e77bd6d6f0f1f069a855b9edc02
2017-11-03 19:21:18 +00:00
Jean-Michel Trivi
a8eba4b634 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours
am: 272ae57aa8

Change-Id: Id7da9dba87a2951901e0732e666cd84b1e6d573e
2017-11-03 19:21:05 +00:00
Jean-Michel Trivi
7f986a4b77 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 3b6a14a1e0 am: a1deac7b1a
am: bceba8dd97  -s ours

Change-Id: I1c7b0d98c7dc985852863c3466ad98df394c750e
2017-11-03 19:21:04 +00:00
Jean-Michel Trivi
41363eb993 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55
am: 75fe8cb95e  -s ours

Change-Id: I0c790baf5af9e6d15efbbf7cd175770696aa7391
2017-11-03 19:19:32 +00:00
Jean-Michel Trivi
06c27a9feb Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e
am: 6e15baff97

Change-Id: Ic11d63d594dabfb8359d19eb36f9bdcc56abd2ac
2017-11-03 19:19:22 +00:00
Jean-Michel Trivi
724b40ccce DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65
am: d157498711  -s ours

Change-Id: Ica332afb180137b27845c06d35108928102826f6
2017-11-03 19:19:04 +00:00
Jean-Michel Trivi
73d49a121c DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 am: 3e28ad2039
am: d948041971

Change-Id: I078057af435ad081e8f55574c03706b8e73405e4
2017-11-03 19:17:58 +00:00
Jean-Michel Trivi
75fe8cb95e Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2
am: 022a305d55

Change-Id: I15f8ada5cbf90deefb7e9d2221a58a3b8f8dd038
2017-11-03 19:17:35 +00:00