)]}' { "log": [ { "commit": "f1307ef28376cb2a7aefa1bfa7f9f66e22284f6c", "tree": "158eaeb292b5928d279cf007977db161da2b9654", "parents": [ "b6b78798a47a74d511b9bcd6543b71cb675730bd", "fa3781fe0fb654659634d7b4703b6ed2ae27fdeb" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Jun 29 17:05:26 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 29 17:05:26 2020 +0000" }, "message": "Merge \"clearkey hidl: fix oob read in decrypt\" into pi-dev" }, { "commit": "b6b78798a47a74d511b9bcd6543b71cb675730bd", "tree": "2ad564ccd79a8b3ef9340381f03ff35694501b2a", "parents": [ "284841d9e38958afca6f95f5bdbcdfb960a4dfa7", "abc29d848e19449f55bb4a19226ef9594f3d030c" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 18:06:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 18:06:50 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99 am: f543f7ffc1 am: abc29d848e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11566487\n\nChange-Id: Ic3e618a12eaac79e04857483ccb1cef606072079\n" }, { "commit": "abc29d848e19449f55bb4a19226ef9594f3d030c", "tree": "294a6fcb8a58f5a9584f0d5fc0220858a512ecff", "parents": [ "b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0", "f543f7ffc1f9db22d7bb0c29315d21004adb4330" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 17:51:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 17:51:37 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99 am: f543f7ffc1\n\nOriginal change: undetermined\n\nChange-Id: Ie073af9204def3cc7bfbc9b9435cd65df443428f\n" }, { "commit": "f543f7ffc1f9db22d7bb0c29315d21004adb4330", "tree": "1387f426aa812345359c7f3321717faa35d1e728", "parents": [ "e8f92b71839096baf8ba9e5b3709cf83b59b035f", "cb06eeab99dad7de64b3d6e26567c5ed825d9fa8" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 17:34:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 17:34:24 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99\n\nOriginal change: undetermined\n\nChange-Id: I9a2704421608984faa8d610af219b47dfc6dd1ae\n" }, { "commit": "cb06eeab99dad7de64b3d6e26567c5ed825d9fa8", "tree": "8be381e9fb1f6ba036774d52bfbff5d7f4a9ea32", "parents": [ "12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24", "6aaef5a99f15da847a8c55a137bfc6263829e8ff" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 17:17:30 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 02 17:17:30 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev" }, { "commit": "284841d9e38958afca6f95f5bdbcdfb960a4dfa7", "tree": "66e2b767b91c619fc3c7f7bbff1759cb246b4f88", "parents": [ "d95af0cdc115d306d127bd296454f3f213fe3c8f", "b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:34:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:34:56 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4 am: e8f92b7183 -s ours am: b7b552e563 -s ours\n\nam skip reason: Change-Id I1e9bbcd67a1510f70fad66e8ef77f529008e248a with SHA-1 86b46a20b2 is in history\n\nOriginal change: undetermined\n\nChange-Id: I40948fb4fc108dbb5d9ec327bc50c449d1ae548b\n" }, { "commit": "b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0", "tree": "a15fd14cb22f5d1342656ff8d594f04da6535d70", "parents": [ "8220d3f72c42befa948737ae4bd6b3fcc5fb2927", "e8f92b71839096baf8ba9e5b3709cf83b59b035f" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:22:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:22:22 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4 am: e8f92b7183 -s ours\n\nam skip reason: Change-Id I9c473e47e7eb8dce24399bcb24f82a3d2d583983 with SHA-1 8220d3f72c is in history\n\nOriginal change: undetermined\n\nChange-Id: I902bd921471f32a9098bc3db065673be6f1e7769\n" }, { "commit": "e8f92b71839096baf8ba9e5b3709cf83b59b035f", "tree": "1967092d16164f9a7a2429dcc2115094c882a76b", "parents": [ "54c13ace7b02bbf74af87e608f09c07fa98d9c86", "12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:10:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:10:21 2020 +0000" }, "message": "Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4\n\nOriginal change: undetermined\n\nChange-Id: I745cdf75d93a5025b677a703a030dec93a9957c4\n" }, { "commit": "d95af0cdc115d306d127bd296454f3f213fe3c8f", "tree": "66e2b767b91c619fc3c7f7bbff1759cb246b4f88", "parents": [ "86b46a20b2730790759aefcfa4c5d0cb3589c61b", "8220d3f72c42befa948737ae4bd6b3fcc5fb2927" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 13:49:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 13:49:55 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 8220d3f72c -s ours\n\nam skip reason: Change-Id I1e9bbcd67a1510f70fad66e8ef77f529008e248a with SHA-1 86b46a20b2 is in history\n\nOriginal change: undetermined\n\nChange-Id: I335133ca5ee6e41761c7732046b0469ecd3ad005\n" }, { "commit": "6aaef5a99f15da847a8c55a137bfc6263829e8ff", "tree": "1d011c423b846708e21638d35048a2ddf788f282", "parents": [ "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Wed May 20 16:49:23 2020 +0100" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Thu May 21 04:15:01 2020 +0000" }, "message": "Fix potential use-after-free issue\n\nNuPlayerListener passed this out of its constructor to\nIStreamSource-\u003esetListener, and it would get wrapped in a smart pointer,\nthen free\u0027d when that method returned.\n\nMove the setListener call after instantiation of NuPlayerListener to\navoid passing this out of the NuPlayerListener constructor.\n\nTest: tested in presubmit\nBug: 151456667\nChange-Id: I996d9ad9eaf0e52992b7f9e10fd94a94c350ad73\n(cherry picked from commit aad519df7fe3b69c8247669ea77ce339a44e8c51)\n" }, { "commit": "8220d3f72c42befa948737ae4bd6b3fcc5fb2927", "tree": "a15fd14cb22f5d1342656ff8d594f04da6535d70", "parents": [ "acb7a353006f74ba9cdda607b3fb8a87f9faa832" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 18 11:14:33 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 18 13:59:38 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nMerged-In: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\nMerged-In: I1e9bbcd67a1510f70fad66e8ef77f529008e248a\nChange-Id: I9c473e47e7eb8dce24399bcb24f82a3d2d583983\n" }, { "commit": "12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24", "tree": "ff8ced4d899deae39f76b2222e1acf87fb6d1a06", "parents": [ "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 04 16:24:56 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 18 13:58:40 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nMerged-In: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\nMerged-In: I1e9bbcd67a1510f70fad66e8ef77f529008e248a\nMerged-In: I9c473e47e7eb8dce24399bcb24f82a3d2d583983\nChange-Id: If9aeff27e14370bd8104acab1d2b0058d82874fd\n" }, { "commit": "86b46a20b2730790759aefcfa4c5d0cb3589c61b", "tree": "66e2b767b91c619fc3c7f7bbff1759cb246b4f88", "parents": [ "07ff5a7e50cb6595a6d3a7201e8157d0e9eabe0e" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 04 16:23:41 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sat May 09 12:39:43 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nMerged-In: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\nChange-Id: I1e9bbcd67a1510f70fad66e8ef77f529008e248a\n" }, { "commit": "fa3781fe0fb654659634d7b4703b6ed2ae27fdeb", "tree": "d50182551c44e77f1cc33c2cc0052f072be34388", "parents": [ "1859a38c4d8f438eba9cb7b39be102747407fa36" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 01 15:16:20 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu May 07 18:46:03 2020 +0000" }, "message": "clearkey hidl: fix oob read in decrypt\n\nValidate sum of subsample sizes do not overrun source buffer.\n\nBug: 154123412\nTest: poc_CryptoPlugin_cpp_183\nTest: MediaDrmClearkeyTest\nTest: NativeMediaDrmClearkeyTest\nChange-Id: I27b05479202e0caedfd052c683aa1ef187f65679\nMerged-In: I27b05479202e0caedfd052c683aa1ef187f65679\n" }, { "commit": "07ff5a7e50cb6595a6d3a7201e8157d0e9eabe0e", "tree": "5beaa0fe9f1ce615b5c539f62676d6605b8b9192", "parents": [ "1859a38c4d8f438eba9cb7b39be102747407fa36", "acb7a353006f74ba9cdda607b3fb8a87f9faa832" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Sat May 02 00:09:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat May 02 00:09:25 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02 am: 54c13ace7b am: acb7a35300\n\nChange-Id: I47133dc8f9650a75ce135e8df02b5aee713942d9\n" }, { "commit": "acb7a353006f74ba9cdda607b3fb8a87f9faa832", "tree": "cf1e88f66dffd8b04edd5d23f586cfc47d6223ee", "parents": [ "245e44d9cfe008fcc460126f8992abf6c299a45c", "54c13ace7b02bbf74af87e608f09c07fa98d9c86" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Fri May 01 23:58:36 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 01 23:58:36 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02 am: 54c13ace7b\n\nChange-Id: I1838c90cbc4ae1bd719a0ab72fe39d6ad7315322\n" }, { "commit": "54c13ace7b02bbf74af87e608f09c07fa98d9c86", "tree": "d39b9e060c6118e3c1dd625aef6a99640f2c3886", "parents": [ "a9296786e36577a05de3f3500db0cdb2fabf13c0", "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Fri May 01 23:42:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 01 23:42:17 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02\n\nChange-Id: Icebe5dec879863b63f2feaf53da1f66211278633\n" }, { "commit": "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5", "tree": "019da8ecb1dc0f643cc5606194399ad7850b86d3", "parents": [ "4bbfb6d8815002fc79b26aebba5f3ad2226c468e" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Fri Apr 10 04:31:59 2020 +0530" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 10 21:24:18 2020 -0700" }, "message": "m4v_h263: Return error for zero width and height\n\nTest: poc in bug\nBug: 152496149\nBug: 152629190\n\nChange-Id: I07293e97b664e03e29a1392b139132fc137361cd\n" }, { "commit": "1859a38c4d8f438eba9cb7b39be102747407fa36", "tree": "77bb3e9a4cf6ae959be86aa89573f81ef69421b1", "parents": [ "d8d4e803842bed4188606856858189054a89c95c" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Mar 16 11:49:30 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Mar 17 16:27:26 2020 +0000" }, "message": "RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp\n\nThe metadata object might be overriden later and has it memory\nre-allocated; hence snaping the sensor timestamp value before\nwe call into any method that might change the metadata.\n\nTest: build\nBug: 150944913\nMerged-In: I5b10b680e0cce96ca49e1772770adb4835545472\nChange-Id: I5b10b680e0cce96ca49e1772770adb4835545472\n" }, { "commit": "d8d4e803842bed4188606856858189054a89c95c", "tree": "07cbd892a9032ee2899f69abeaf200d0eb447d24", "parents": [ "509f1a5030ec005db387a4f0420af12e03d1b7f8", "245e44d9cfe008fcc460126f8992abf6c299a45c" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:29:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:29:38 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf\n\nChange-Id: I480db45b78b567a832d591df0834dbdae6cf88d0\n" }, { "commit": "245e44d9cfe008fcc460126f8992abf6c299a45c", "tree": "5aabfd0bcd9276de0d1c5f30373f8c4da27c6af9", "parents": [ "8d2c3d65d06bdf21a8fa4715352cb2a12a442579", "a9296786e36577a05de3f3500db0cdb2fabf13c0" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:01 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3\n\nChange-Id: I6518f72aab3fdfd0ec2e455708f3177a4966514e\n" }, { "commit": "a9296786e36577a05de3f3500db0cdb2fabf13c0", "tree": "667e5e739b038a789797ace35b68120e238e1110", "parents": [ "911b808a6568fee9c2fd1aa89039161195873350", "4bbfb6d8815002fc79b26aebba5f3ad2226c468e" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:05:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:05:08 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881\n\nChange-Id: I943db03ec26b3a7ec24636df46e2a21a472d52d2\n" }, { "commit": "4bbfb6d8815002fc79b26aebba5f3ad2226c468e", "tree": "958f89fe190c6ef2d9ddc3cc5fec4d6f0d28389f", "parents": [ "58af3de44d17e6ba716178e147474a20765c1441" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 04 17:23:58 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Mar 10 13:29:13 2020 -0700" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN\n\nBug: 144767096\nTest: poc_ICrypto_283\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\nMerged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1\nChange-Id: If268553440b8a0cbbe011b5396974fd864a7d083\n" }, { "commit": "509f1a5030ec005db387a4f0420af12e03d1b7f8", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "e492965229ce184a76eaffe2d9fdfcf9e3db7af2", "8d2c3d65d06bdf21a8fa4715352cb2a12a442579" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:47:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:47:34 2020 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d am: 911b808a65 am: 8d2c3d65d0 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I685a75f65ec182f032e1da494132b590b9b281c9\n" }, { "commit": "8d2c3d65d06bdf21a8fa4715352cb2a12a442579", "tree": "f2489e7b4ec31cade8f1b12b4c7267ef7bc3bd08", "parents": [ "d0d078020e26dd9ff1f870491bbfef0f9b9560de", "911b808a6568fee9c2fd1aa89039161195873350" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:38:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:38:31 2020 +0000" }, "message": "[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d am: 911b808a65\n\nChange-Id: Id9527a17ad36c249658b211b9f6b6073907666a9\n" }, { "commit": "911b808a6568fee9c2fd1aa89039161195873350", "tree": "2cf0040efd5adab12955bda5b07680238aee9853", "parents": [ "36af5d03196ce1ce41c753cdd63931072d2044ea", "58af3de44d17e6ba716178e147474a20765c1441" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:24:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:24:25 2020 +0000" }, "message": "[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d\n\nChange-Id: I0678c337a6acc5c7b8f355852b43bf8434652143\n" }, { "commit": "58af3de44d17e6ba716178e147474a20765c1441", "tree": "9b775304945d9b8efd68eb2076c5928f5a39be97", "parents": [ "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Feb 27 10:20:17 2020 -0800" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Feb 27 20:50:25 2020 +0000" }, "message": "[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt\n\nbug: 150156584\ntest: build\nChange-Id: Ia4ab8e4b4db0b895d0ca36592c0469adb3b89aac\n" }, { "commit": "e492965229ce184a76eaffe2d9fdfcf9e3db7af2", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "df156dc766918c12b1931eb79919b4db3c959b1a", "d0d078020e26dd9ff1f870491bbfef0f9b9560de" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:59:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:59:54 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e\n\nChange-Id: I38c304066ea808014e288dd4ed6a2f89a34492cb\n" }, { "commit": "d0d078020e26dd9ff1f870491bbfef0f9b9560de", "tree": "2fcced65e527e9c934e8a424994a507150ae4f87", "parents": [ "f0791037c1676ecb6a4af39acabf33db02982545", "36af5d03196ce1ce41c753cdd63931072d2044ea" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:43:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:43:15 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319\n\nChange-Id: Ifa7bc3cd86f60b7fb0d557dbbad12dc7f5a1bcdb\n" }, { "commit": "36af5d03196ce1ce41c753cdd63931072d2044ea", "tree": "861aeab62263d1682d6b1528c06fc0b94a697510", "parents": [ "aca92198a127bb8a7d2e0ba9edcb52954bffcc24", "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:32:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:32:22 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8\n\nChange-Id: Ic58cdb7f33d8eb4acbae84a1fb6885341d177869\n" }, { "commit": "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc", "tree": "482e55c9c1c39b62df473fa54ea3ca65520c9a6a", "parents": [ "51aa2003766aa35d6c6b3ee688a86e117c65b94d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 11 20:21:05 2020 +0000" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 12 05:01:54 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\"\n\nThis reverts commit 51aa2003766aa35d6c6b3ee688a86e117c65b94d.\n\nReason for revert: DRM playback regression\n\nBug: 149067513\nChange-Id: I8d8a51efd57c52b444363ce5f5bd04316b2f4bb8\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\nMerged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1\n" }, { "commit": "df156dc766918c12b1931eb79919b4db3c959b1a", "tree": "e7d769ee251bd8503fd9c23de72b5d65ba55bfd2", "parents": [ "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb", "f0791037c1676ecb6a4af39acabf33db02982545" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:05:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:05:15 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1\n\nChange-Id: Iabb65b41883e0b46a7c0ea2e1a98accba1377eae\n" }, { "commit": "f0791037c1676ecb6a4af39acabf33db02982545", "tree": "a3ad8bf44e83cb5090efe266fba8725836cbf115", "parents": [ "6cf42dbae74a1237cf8861888f990280abbd6ef5", "aca92198a127bb8a7d2e0ba9edcb52954bffcc24" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:52:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:52:31 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1\n\nChange-Id: I19571d507f1234ece0d63542688063f087cf6bd7\n" }, { "commit": "aca92198a127bb8a7d2e0ba9edcb52954bffcc24", "tree": "5d1f140af64c3b4e00860ec902a3447f1509f0e9", "parents": [ "e545f3c8d3f02b80e0fb10c579510167be91da8b", "51aa2003766aa35d6c6b3ee688a86e117c65b94d" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:40:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:40:34 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376\n\nChange-Id: I8c30b0d77d2f5fae31afd7d1ed4cae194078630f\n" }, { "commit": "51aa2003766aa35d6c6b3ee688a86e117c65b94d", "tree": "b13d91733897c04147f067dfd9d9b68a69de0f37", "parents": [ "efd8f9e09a1333e85802e855bd15ceca8948baed" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 04 17:23:58 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 05 18:56:51 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN\n\nBug: 144767096\nTest: poc_ICrypto_283\nChange-Id: Icd57367f8d912ff0a0cf9067c732b8fce169f29d\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\n" }, { "commit": "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "2587ab6c7642062ea1791de1868c28b1164a073c", "dc4c427b2155a9928a7cdaac7c0a787dd9c8192d" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:59:59 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:59:59 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into pi-dev" }, { "commit": "dc4c427b2155a9928a7cdaac7c0a787dd9c8192d", "tree": "853f066e1e6e5e271cc17315708f1033659fbb5c", "parents": [ "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 17:56:17 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 16 22:52:46 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: I9425baa21c82d5a5edf37c87989adbade0428b67\n" }, { "commit": "2587ab6c7642062ea1791de1868c28b1164a073c", "tree": "6c2e29839ae30177cc4b9e21b51a02159767fa33", "parents": [ "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Nov 26 14:40:45 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 01:20:01 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: I050504c1ef4e5c41fb47ee97e98db41399288a91\n" }, { "commit": "1d2cccfd2abecda52b49f123bf5905079578c542", "tree": "ec1a0da9244843b5a907d73afed87baffb5e7582", "parents": [ "5dd7590c6c6fcedd77ac5ec2dd97c8badfb9eb36", "43def76fcdb1d3a9b14a3f19a4c8a33534f8b003" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 17:02:59 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 03 17:02:59 2019 +0000" }, "message": "Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into pi-dev" }, { "commit": "43def76fcdb1d3a9b14a3f19a4c8a33534f8b003", "tree": "2d92bb5117c35acdb1a76b06ccf5981132d1500e", "parents": [ "874ec86ebc323baa7e6a6ab784dc4550444d6aa6" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Aug 20 15:42:04 2019 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Aug 28 16:35:24 2019 +0000" }, "message": "AudioFlinger: enforce OP_RECORD_AUDIO during recording\n\n Fix issue where RecordTrack silencing didn\u0027t silence the\nfull buffer: the memset to 0 was using the RecordThread frame\nsize, not the RecordTrack frame size.\n OP_RECORD_AUDIO was only enforced at the start of a recording\nwhich would fail if not granted. This patch silences the recording\n(i.e. silence is recorded instead) when it is lost, and undoes that\nwhen granted again. This requires:\n- propagating the package name of the client to the RecordTrack class\n- registering an appOp callback in RecordTrack (through a new\n OpRecordAudioMonitor class) to (un)silence the recording\n- update the isSilenced() method to take into account the appOp.\n\nBug: 138968594\nBug: 138636979\nTest: run app that records audio, then \"adb shell appops __pack_name__ 27 2\"\n and verify recording is silent after that.\n\nChange-Id: I4ebdb2f02409fdf045a77132bf7a1b24249ad948\nMerged-In: Ib33f5b592185a67204997213bab1ac2594d90d37\n" }, { "commit": "5dd7590c6c6fcedd77ac5ec2dd97c8badfb9eb36", "tree": "aa39cb7ba612c2ca194b66e8d8d84dbb7fa46cbe", "parents": [ "874ec86ebc323baa7e6a6ab784dc4550444d6aa6" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Aug 26 17:03:13 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Aug 26 17:51:28 2019 -0700" }, "message": "[RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes\n\n* reject native handle output\n* validate subsample sizes\n\nBug: 137283376\nTest: cryptopoc\nChange-Id: Ic4267fdc0e391bdecc1caab3b8fd4aa34ad76541\n" }, { "commit": "874ec86ebc323baa7e6a6ab784dc4550444d6aa6", "tree": "5acaa25657e1c804fa8321b4ee74f1914ff142c6", "parents": [ "b44663498f7e6513b4fe23db1362be80e7f28ad6", "6cf42dbae74a1237cf8861888f990280abbd6ef5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 16:16:08 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 16:16:08 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c am: efd8f9e09a am: e545f3c8d3\nam: 6cf42dbae7\n\nChange-Id: Iae11a06a5f69d5528195a1856106c3ebc2cfee49\n" }, { "commit": "6cf42dbae74a1237cf8861888f990280abbd6ef5", "tree": "2fcced65e527e9c934e8a424994a507150ae4f87", "parents": [ "4e314d9197ce973089cdadb8515444f418d5712e", "e545f3c8d3f02b80e0fb10c579510167be91da8b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 16:03:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 16:03:02 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c am: efd8f9e09a\nam: e545f3c8d3\n\nChange-Id: Ic82cb29ade87f3bdee2504792206c7ae2f03456c\n" }, { "commit": "e545f3c8d3f02b80e0fb10c579510167be91da8b", "tree": "861aeab62263d1682d6b1528c06fc0b94a697510", "parents": [ "3c1c45dd71bf40976879caab9fafec81035d5666", "efd8f9e09a1333e85802e855bd15ceca8948baed" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 15:44:48 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 15:44:48 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c\nam: efd8f9e09a\n\nChange-Id: Ifa62d98915c01f3605e73479126347ddb2fdb92d\n" }, { "commit": "efd8f9e09a1333e85802e855bd15ceca8948baed", "tree": "482e55c9c1c39b62df473fa54ea3ca65520c9a6a", "parents": [ "e82c14f41dd6e183a83a6df18b245dd9c50722ea", "88c0c4897c8d3c5c29748fff0bf9d69fb35cf231" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:19 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:19 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c\n\nChange-Id: I8958693ac165e148e56dc682f1b55cbcd18c3754\n" }, { "commit": "88c0c4897c8d3c5c29748fff0bf9d69fb35cf231", "tree": "3628dc85dd6979d94b6b6a076e89c9e195bb2f97", "parents": [ "ee98fbf5845ff20981c2de718ee228effab4484b", "6fa588c7b61e00a98461870294f5279667fa921b" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:17 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:17 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6\n\nChange-Id: I9880e8be2ac6cf928ea139bff99a007bf38aa3eb\n" }, { "commit": "6fa588c7b61e00a98461870294f5279667fa921b", "tree": "4bff936b3c1c958c91454ac8a5b7e2edbbf7ea05", "parents": [ "c9528234a117559621b98663e016d0757c160df2", "144ba691873f4dbcdbaa5a53c208bd25b31932cf" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:16 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:16 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187\n\nChange-Id: Ie6b0359a394ea7669be0cd7be4f1005c7e8dbb92\n" }, { "commit": "144ba691873f4dbcdbaa5a53c208bd25b31932cf", "tree": "b2a6131c9371cb982cbb35f471517361f6edc92d", "parents": [ "644ad716f0a5ff794aa1a403b0d2fc7164382e7e", "9832a2a3f469d344a82ffc6288abd9fc4bdcb61d" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:14 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:14 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4\n\nChange-Id: I94d3301f216945075838b6cc46e7644f8e91a313\n" }, { "commit": "9832a2a3f469d344a82ffc6288abd9fc4bdcb61d", "tree": "a4e201506092da308493d398b4f6ab7a187d235d", "parents": [ "08aa2367b5f627068249b8a1003365ac2d16b1cc", "ef4ce157000b2b5bcbf2bcb36a228ec604803547" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:12 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:12 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700\n\nChange-Id: I704568c683a2ec4dc5ee5bf5e977c2300f41061a\n" }, { "commit": "ef4ce157000b2b5bcbf2bcb36a228ec604803547", "tree": "d0372c38f6c48e9a530d7dbcc0b504e0d62a2fea", "parents": [ "7802c68aebf7908983508fd4a52a7d53746a80eb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jul 23 08:27:46 2019 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jul 24 17:33:10 2019 +0000" }, "message": "Fix OOB access in mpeg4/h263 decoder\n\nThe decoder does not support an increase in frame width, and\nwould exceed its buffer if the width increased mid-stream.\nThere was an existing check to prevent the total frame size\n(width*height) from increasing, but in fact the decoder also\ndoes not even support a width increase, even if the height\ndecreases correspondingly.\n\nBug: 136175447\nBug: 136173699\nTest: manual\nChange-Id: Ic2d28bb0503635dadeb69ba3be9412d58684e910\n" }, { "commit": "b44663498f7e6513b4fe23db1362be80e7f28ad6", "tree": "f12efbf67e9cf2b4d4fc25c9941fd4600ebf45e2", "parents": [ "537bb11d8d5d692b572fea1f4b901acc99f004b3", "4e314d9197ce973089cdadb8515444f418d5712e" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Thu Jun 27 12:24:58 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 27 12:24:58 2019 -0700" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5 am: 644ad716f0 am: c9528234a1 am: ee98fbf584 am: e82c14f41d am: 3c1c45dd71\nam: 4e314d9197\n\nChange-Id: Ia2c81329d30376878e5e2438e3bc941a5b1b5b0b\n" }, { "commit": "4e314d9197ce973089cdadb8515444f418d5712e", "tree": "d301d03b3684a30d209c1c505e94daeac5e912bd", "parents": [ "29b1c433c21a67d9efb2616a26baeaefc2026718", "3c1c45dd71bf40976879caab9fafec81035d5666" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Thu Jun 27 12:16:56 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 27 12:16:56 2019 -0700" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5 am: 644ad716f0 am: c9528234a1 am: ee98fbf584 am: e82c14f41d\nam: 3c1c45dd71\n\nChange-Id: Icf5f4e75782e692f090c25e8f682f94757e16d7e\n" }, { "commit": "3c1c45dd71bf40976879caab9fafec81035d5666", "tree": "02393e1e8175d3d357a1d883c7c26031bf4422e8", "parents": [ "66171de55ca26d77c0bbdbb8554b286a25566099", "e82c14f41dd6e183a83a6df18b245dd9c50722ea" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Thu Jun 27 12:10:09 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 27 12:10:09 2019 -0700" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5 am: 644ad716f0 am: c9528234a1 am: ee98fbf584\nam: e82c14f41d\n\nChange-Id: Iaddbc9ad1cc54addec6f1e20f7ed9bf1dd11552b\n" }, { "commit": "e82c14f41dd6e183a83a6df18b245dd9c50722ea", "tree": "b14cf8f9e6a40b4a4ad696aa51ec089b536f62ce", "parents": [ "12b4e9b11a0ab45e2d118ba53d72d1d907871d72", "ee98fbf5845ff20981c2de718ee228effab4484b" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:40 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:40 2019 +0000" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5 am: 644ad716f0 am: c9528234a1 am: ee98fbf584\n\nChange-Id: I994cbd3775deb823d56da23b679235f26a0006b5\n" }, { "commit": "ee98fbf5845ff20981c2de718ee228effab4484b", "tree": "10251fbb728b0560130ed7d913d0edbd9b91f761", "parents": [ "b257d6414e5893c909f9b68630aa1ecc10c2a982", "c9528234a117559621b98663e016d0757c160df2" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:36 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:36 2019 +0000" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5 am: 644ad716f0 am: c9528234a1\n\nChange-Id: Icc22f3872442fa95f2333a7eb4d577a281c703fa\n" }, { "commit": "c9528234a117559621b98663e016d0757c160df2", "tree": "9af3f08c79d39aeb909de278247fa155f0d041fc", "parents": [ "3faebc5eb32130b83bbf4cb85a53d13ce2e39ce8", "644ad716f0a5ff794aa1a403b0d2fc7164382e7e" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:33 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:33 2019 +0000" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5 am: 644ad716f0\n\nChange-Id: I17c7f0ac31f92f8957461794e0b01d187219843d\n" }, { "commit": "644ad716f0a5ff794aa1a403b0d2fc7164382e7e", "tree": "9bd4ffbe399d8fd55eda192e6dbf4304acc245cf", "parents": [ "30d710f5af65952c3d891a374b61f90fadd2ba45", "08aa2367b5f627068249b8a1003365ac2d16b1cc" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:31 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:31 2019 +0000" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5\n\nChange-Id: Ie1301b5ec3749d8bb09f5a48137402364c81d102\n" }, { "commit": "08aa2367b5f627068249b8a1003365ac2d16b1cc", "tree": "5136bf03c4f2241b2c34fdd584581e8a38efd69c", "parents": [ "8b8f583fa51a0ba34b58efc50237d4513235692f", "7802c68aebf7908983508fd4a52a7d53746a80eb" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:28 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jun 21 21:22:28 2019 +0000" }, "message": "[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb\n\nChange-Id: Ia21e84bf3562c3892698f3a1513acccd5f530986\n" }, { "commit": "7802c68aebf7908983508fd4a52a7d53746a80eb", "tree": "445a1e9d2b2bd40c503a26c4f39ea60bc8bd49a6", "parents": [ "e3342733fe9da03a9bbfaa0a7b3925202ee0cb01" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 21 14:17:58 2019 -0700" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Jun 21 21:22:24 2019 +0000" }, "message": "m4v_h263: add a test for invalid/negative value\n\nTest: run poc with and without the patch.\nBug: 134578122\nChange-Id: I2d11826d1d9e2669aa5627065dc627729ddc823b\n" }, { "commit": "537bb11d8d5d692b572fea1f4b901acc99f004b3", "tree": "d750e00d6268197aa6f3438f87f5968bab86884b", "parents": [ "b1ff5c4a80796c3ddc6eb3a9c32c00650fc3b8ea", "29b1c433c21a67d9efb2616a26baeaefc2026718" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 11:23:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 11:23:47 2019 -0700" }, "message": "[automerger skipped] Merge changes from topic \"am-e66183f9-fddc-442d-99f7-bd853e184fba\" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours\nam: 29b1c433c2 -s ours\nam skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history\n\nChange-Id: I89accfeea89f68d2b97da2dbe7e3a9109b53deff\n" }, { "commit": "b1ff5c4a80796c3ddc6eb3a9c32c00650fc3b8ea", "tree": "d750e00d6268197aa6f3438f87f5968bab86884b", "parents": [ "cd459bae6400f00d227eb5a44e72564a8d4cb5e9", "83ded3350ede57a03a0ffca2ba150df7429352ad" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 11:23:35 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 11:23:35 2019 -0700" }, "message": "[automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours\nam: 83ded3350e -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ic4fed722517454b594c63204c226893d7f63fc0a\n" }, { "commit": "29b1c433c21a67d9efb2616a26baeaefc2026718", "tree": "1772d94431223a2060b69b8332e266dc9cec5e19", "parents": [ "83ded3350ede57a03a0ffca2ba150df7429352ad", "66171de55ca26d77c0bbdbb8554b286a25566099" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 11:16:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 11:16:47 2019 -0700" }, "message": "[automerger skipped] Merge changes from topic \"am-e66183f9-fddc-442d-99f7-bd853e184fba\" into oc-dev am: 12b4e9b11a\nam: 66171de55c -s ours\nam skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history\n\nChange-Id: Ief599a58c9b329f8e5c215a79f4d3b2b3a55a4b2\n" }, { "commit": "83ded3350ede57a03a0ffca2ba150df7429352ad", "tree": "1772d94431223a2060b69b8332e266dc9cec5e19", "parents": [ "3186eb649845c8895767133b86c6f8bcc6f53dba", "c49dabdd952586273f1c743f56bb3e3f7d97eccc" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 11:16:38 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 11:16:38 2019 -0700" }, "message": "[automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001\nam: c49dabdd95 -s ours\nam skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history\n\nChange-Id: Ic042305b658414d72a4c1c8060a982729a972c81\n" }, { "commit": "66171de55ca26d77c0bbdbb8554b286a25566099", "tree": "813a9c343a0f6c509e19f867e0c321ec2134a3d2", "parents": [ "c49dabdd952586273f1c743f56bb3e3f7d97eccc", "12b4e9b11a0ab45e2d118ba53d72d1d907871d72" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 11:10:49 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 11:10:49 2019 -0700" }, "message": "Merge changes from topic \"am-e66183f9-fddc-442d-99f7-bd853e184fba\" into oc-dev\nam: 12b4e9b11a\n\nChange-Id: If2be334cae212f0006ce24bf68ee13b5d92749f6\n" }, { "commit": "c49dabdd952586273f1c743f56bb3e3f7d97eccc", "tree": "813a9c343a0f6c509e19f867e0c321ec2134a3d2", "parents": [ "7242dcd76713f89524142ec200921f3c0940222d", "ccab80f0013a7bb139f698a823c389a682ed912f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 11:10:46 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 11:10:46 2019 -0700" }, "message": "[automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e\nam: ccab80f001\n\nChange-Id: I140dbd35bdcbdfa14f45f2702bea90e29cd9479a\n" }, { "commit": "12b4e9b11a0ab45e2d118ba53d72d1d907871d72", "tree": "0039775face857b479da9578570c9119878ebf11", "parents": [ "f30859cd4b94e6f855cc85969a7a9b50a7891dad", "ccab80f0013a7bb139f698a823c389a682ed912f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 06 17:56:32 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 06 17:56:32 2019 +0000" }, "message": "Merge changes from topic \"am-e66183f9-fddc-442d-99f7-bd853e184fba\" into oc-dev\n\n* changes:\n [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e\n [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3\n [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af\n [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5\n [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870\n [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx\n" }, { "commit": "e3342733fe9da03a9bbfaa0a7b3925202ee0cb01", "tree": "ae2d6f3d0f72d62c25576dc2d4c9ff540a4a42b7", "parents": [ "b49c39c8f3a9b33ad52174a08ee235f357e67e17", "04e48ed870c1c4163948bceee034d750ae60b5d4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 06 17:56:32 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 06 17:56:32 2019 +0000" }, "message": "Merge \"[DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx\" into nyc-dev" }, { "commit": "cd459bae6400f00d227eb5a44e72564a8d4cb5e9", "tree": "d750e00d6268197aa6f3438f87f5968bab86884b", "parents": [ "4d5d3df900eb4d873c5899e8e3fef9e11da2808c", "3186eb649845c8895767133b86c6f8bcc6f53dba" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 10:32:17 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 10:32:17 2019 -0700" }, "message": "[automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours\nam: 3186eb6498 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I96e9ec6a75b85b56cde2c9b0b50b37a57834340b\n" }, { "commit": "3186eb649845c8895767133b86c6f8bcc6f53dba", "tree": "1772d94431223a2060b69b8332e266dc9cec5e19", "parents": [ "dc8528f6c625d9749163ffd41b0f8d630dc6aae0", "7242dcd76713f89524142ec200921f3c0940222d" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 10:27:24 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 10:27:24 2019 -0700" }, "message": "[automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours\nam: 7242dcd767 -s ours\nam skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history\n\nChange-Id: I5e9ff2dbcc3c0117d5c0455854d64d7933b0a7fe\n" }, { "commit": "7242dcd76713f89524142ec200921f3c0940222d", "tree": "813a9c343a0f6c509e19f867e0c321ec2134a3d2", "parents": [ "e46c142ad59284a4f6e64984dac6d4aba00f4276", "f30859cd4b94e6f855cc85969a7a9b50a7891dad" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 10:22:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 10:22:21 2019 -0700" }, "message": "[automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx\nam: f30859cd4b -s ours\nam skip reason: SHA1 f30859cd4b skipped by user jmtrivi\n\nChange-Id: I45330d214342dcd365596e99f18c0b61190226e8\n" }, { "commit": "4d5d3df900eb4d873c5899e8e3fef9e11da2808c", "tree": "d750e00d6268197aa6f3438f87f5968bab86884b", "parents": [ "be89013ef6658c7a3ff7e52540c2f94ddd27410c", "dc8528f6c625d9749163ffd41b0f8d630dc6aae0" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 09:47:14 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 06 09:47:14 2019 -0700" }, "message": "Merge \"AMR WB encoder: prevent OOB write in ACELP_4t64_fx\" into oc-mr1-dev\nam: dc8528f6c6\n\nChange-Id: Idc98f9f5d735153e5ab732ffd7275a8ab5ee9599\n" }, { "commit": "dc8528f6c625d9749163ffd41b0f8d630dc6aae0", "tree": "1772d94431223a2060b69b8332e266dc9cec5e19", "parents": [ "e0a91a0000f7606a22a28bb3be0921a4407c54ab", "9a44849c88b306e1b4fb37bd9aa34d6ba0607b7a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 06 16:23:55 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 06 16:23:55 2019 +0000" }, "message": "Merge \"AMR WB encoder: prevent OOB write in ACELP_4t64_fx\" into oc-mr1-dev" }, { "commit": "f30859cd4b94e6f855cc85969a7a9b50a7891dad", "tree": "0039775face857b479da9578570c9119878ebf11", "parents": [ "ec5a0f46569a50ce51cb0fd189ac4a47d7d90c16" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Jun 05 09:11:39 2019 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 06 15:19:51 2019 +0000" }, "message": "[DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx\n\nIn ACELP_4t64_fx, when iterating over ind array, check index against\n array size to prevent OOB write, log an error if such an access\n was about to happen.\n\nBug 132647222\nTest: atest EncoderTest#testAMRWBEncoders\nMerged-in: I33f476d94baec2feffc7bcccd0ad0481b8452518\n\nChange-Id: I814a05217f20ea3b941deddb70edb31cd342de6b\n" }, { "commit": "ccab80f0013a7bb139f698a823c389a682ed912f", "tree": "b1566d53f1964c046e93f0e7cec864c34fac4170", "parents": [ "ec5a0f46569a50ce51cb0fd189ac4a47d7d90c16", "b257d6414e5893c909f9b68630aa1ecc10c2a982" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:20 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:20 2019 +0000" }, "message": "[automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e\n\nChange-Id: If9909fb0e2107a7bfa24dd4ef8101426db0d2467\n" }, { "commit": "b257d6414e5893c909f9b68630aa1ecc10c2a982", "tree": "1898f306ad26f14f2eed716c7f378c69ce5e4ae2", "parents": [ "85c9f651e119efca7666f57457297cf5f6506e01", "3faebc5eb32130b83bbf4cb85a53d13ce2e39ce8" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:16 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:16 2019 +0000" }, "message": "[automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3\n\nChange-Id: Ie343878173439dd512a05cb72fae6e0caa2d6056\n" }, { "commit": "3faebc5eb32130b83bbf4cb85a53d13ce2e39ce8", "tree": "36dfa3026bcb295e048d735c3e6fea17b9da6fdd", "parents": [ "4a6825b42820e4f2247572a68715f2a37865463c", "30d710f5af65952c3d891a374b61f90fadd2ba45" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:12 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:12 2019 +0000" }, "message": "[automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af\n\nChange-Id: Ic5935865167a8ea30c207140d61b6b42475a07b0\n" }, { "commit": "30d710f5af65952c3d891a374b61f90fadd2ba45", "tree": "d995ad57dccd2190100dd8a4954f9ae7d0775703", "parents": [ "0687048443511a7081f76e20cb1e63f9c6ae747c", "8b8f583fa51a0ba34b58efc50237d4513235692f" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:08 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:08 2019 +0000" }, "message": "[automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5\n\nChange-Id: Id86b592e0fe8a70bb4ebffaf13b2e35d84cdbf59\n" }, { "commit": "8b8f583fa51a0ba34b58efc50237d4513235692f", "tree": "51617e4efc471cd3be7ee9943d79f6481ffd73ae", "parents": [ "33aec3dda53d3919d44799044f982daed2c77009", "04e48ed870c1c4163948bceee034d750ae60b5d4" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:03 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jun 05 21:11:03 2019 +0000" }, "message": "[automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870\n\nChange-Id: Ia03cdb5a0e3c8b422d6465aa9c1dd3fd0e0fe5ae\n" }, { "commit": "04e48ed870c1c4163948bceee034d750ae60b5d4", "tree": "aa25201b2f848949b749b8514cc91343d567927a", "parents": [ "851e22d1dc89a7f708b9d2b56947f69cd1a08b94" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Jun 05 09:11:39 2019 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Jun 05 21:10:59 2019 +0000" }, "message": "[DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx\n\nIn ACELP_4t64_fx, when iterating over ind array, check index against\n array size to prevent OOB write, log an error if such an access\n was about to happen.\n\nBug 132647222\nTest: atest EncoderTest#testAMRWBEncoders\nMerged-in: I33f476d94baec2feffc7bcccd0ad0481b8452518\n\nChange-Id: I814a05217f20ea3b941deddb70edb31cd342de6b\n" }, { "commit": "be89013ef6658c7a3ff7e52540c2f94ddd27410c", "tree": "318f1f82fcc5b8946c07b925ce06cd74ff798bfd", "parents": [ "c17a483a1f92ae4f672846148d1011854da489d6", "e0a91a0000f7606a22a28bb3be0921a4407c54ab" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Jun 05 14:06:36 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 14:06:36 2019 -0700" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into oc-dev am: ec5a0f4656 am: e46c142ad5\nam: e0a91a0000\n\nChange-Id: I9b665fc06301fdcb2c2e38d6f34461e334aa1749\n" }, { "commit": "e0a91a0000f7606a22a28bb3be0921a4407c54ab", "tree": "b19ffd71a2679457bc07cfe4afdd1103089c0f7a", "parents": [ "6ea9da936bfb4f3fa5a062cfbe8506595670a3be", "e46c142ad59284a4f6e64984dac6d4aba00f4276" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Jun 05 14:00:35 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 14:00:35 2019 -0700" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into oc-dev am: ec5a0f4656\nam: e46c142ad5\n\nChange-Id: Ic7bc8c3913ff56dce95d110cd26cd09aa93daad1\n" }, { "commit": "e46c142ad59284a4f6e64984dac6d4aba00f4276", "tree": "813a9c343a0f6c509e19f867e0c321ec2134a3d2", "parents": [ "e44b6c7854e8e9b4a0d45317becbb5a02db60544", "ec5a0f46569a50ce51cb0fd189ac4a47d7d90c16" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Jun 05 13:55:37 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 05 13:55:37 2019 -0700" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into oc-dev\nam: ec5a0f4656\n\nChange-Id: I14ed475a3de2342592dfe744bab3cb518dbe4c00\n" }, { "commit": "b49c39c8f3a9b33ad52174a08ee235f357e67e17", "tree": "fe39688528e3ed6eb8b32498c884bc4242753579", "parents": [ "851e22d1dc89a7f708b9d2b56947f69cd1a08b94", "f3808d3a2e8c646d5edad451a80daa61a4e5d836" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "message": "Merge \"httplive: detect oom if playlist is infinite\" into nyc-dev" }, { "commit": "ec5a0f46569a50ce51cb0fd189ac4a47d7d90c16", "tree": "b1566d53f1964c046e93f0e7cec864c34fac4170", "parents": [ "806e1cbf2f40a7f308d639b5aff09dc0bedbd16a", "ffffa5eeb07ad42af768f78ec8cd7b44655873ab" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into oc-dev\n\n* changes:\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9 am: 2f3fb2626c am: 188e94625d\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9 am: 2f3fb2626c\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e\n httplive: detect oom if playlist is infinite\n" }, { "commit": "85c9f651e119efca7666f57457297cf5f6506e01", "tree": "327e95185a27f60fb7a33b61422e2b95826e267d", "parents": [ "ec9f664d7bbe5ff91e368694f004a9d3c86834d3", "188e94625dfe42f2e963259b3eb1329f1a14c2d3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into nyc-mr2-dev\n\n* changes:\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9 am: 2f3fb2626c\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e\n httplive: detect oom if playlist is infinite\n" }, { "commit": "4a6825b42820e4f2247572a68715f2a37865463c", "tree": "a99e6c028ac81d04293643d17455ba2327916add", "parents": [ "0d6a0e7d8882a45a435d73e16b40dde6d807a935", "2f3fb2626c0a12ce6e5b6b7e7ca0ccc15e39e5e3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into cw-f-dev\n\n* changes:\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e\n httplive: detect oom if playlist is infinite\n" }, { "commit": "0687048443511a7081f76e20cb1e63f9c6ae747c", "tree": "5f05179d4a5de0140fd3bef24043931955124388", "parents": [ "93e7dd1e8b9e943ba1321fc7eb38d41fd94aeb70", "f5dcf4dca93f6ccf5b08eccd4061f826930366dd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into nyc-mr1-dev\n\n* changes:\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e\n httplive: detect oom if playlist is infinite\n" }, { "commit": "33aec3dda53d3919d44799044f982daed2c77009", "tree": "eb1700b7b9258781698c9d613689f37555b32d74", "parents": [ "efeff0775095805b7cf84b3ddb4a29badd5894d8", "a7a8c35d92e6a97d13d5a018f5424c82951ebad2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 05 20:36:06 2019 +0000" }, "message": "Merge changes from topic \"am-b39caaa3-4861-4759-a55f-8e0eb691097b\" into nyc-dr1-dev\n\n* changes:\n [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e\n httplive: detect oom if playlist is infinite\n" }, { "commit": "9a44849c88b306e1b4fb37bd9aa34d6ba0607b7a", "tree": "1c93e355851a064707d62ff382fd00146362efb0", "parents": [ "6ea9da936bfb4f3fa5a062cfbe8506595670a3be" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri May 17 07:29:07 2019 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Jun 04 20:23:38 2019 +0000" }, "message": "AMR WB encoder: prevent OOB write in ACELP_4t64_fx\n\nIn ACELP_4t64_fx, when iterating over ind array, check index against\n array size to prevent OOB write, log an error if such an access\n was about to happen.\n\nBug: 132647222\nTest: atest EncoderTest#testAMRWBEncoders\nChange-Id: I33f476d94baec2feffc7bcccd0ad0481b8452518\n(cherry picked from commit 82cb46d0d55a407f468023977204eb7133b7fd77)\nMerged-in: I33f476d94baec2feffc7bcccd0ad0481b8452518\n" }, { "commit": "c17a483a1f92ae4f672846148d1011854da489d6", "tree": "892ce8c18fd81bdae4bbb7b08edf7810f9877116", "parents": [ "35cce3f4c47f34807dcf93760dc52ea0c9662bf9", "6ea9da936bfb4f3fa5a062cfbe8506595670a3be" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri May 31 21:07:15 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 21:07:15 2019 -0700" }, "message": "[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88 am: ec9f664d7b am: 806e1cbf2f am: e44b6c7854\nam: 6ea9da936b\n\nChange-Id: I556adbb0d70058548e844baa6c9169d22790d6ba\n" }, { "commit": "6ea9da936bfb4f3fa5a062cfbe8506595670a3be", "tree": "f144610d9aa01184f624b0ec0e5b1b61b1b798d7", "parents": [ "155ffdba2caa4b839ce8abd11d8d3f202c80aaeb", "e44b6c7854e8e9b4a0d45317becbb5a02db60544" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri May 31 20:26:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 20:26:21 2019 -0700" }, "message": "[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88 am: ec9f664d7b am: 806e1cbf2f\nam: e44b6c7854\n\nChange-Id: I04fd7f315d04d70aa8a47a2cfde20ab16e8b9826\n" }, { "commit": "e44b6c7854e8e9b4a0d45317becbb5a02db60544", "tree": "e705ee4da1abf0dd35b857f47de5da108587595a", "parents": [ "d13505b1a3094e35c8f06d299194b0e9da9b07b4", "806e1cbf2f40a7f308d639b5aff09dc0bedbd16a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri May 31 19:46:06 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 31 19:46:06 2019 -0700" }, "message": "[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88 am: ec9f664d7b\nam: 806e1cbf2f\n\nChange-Id: If8f647ff59b17f9cecae2ca70f289d37a24ff318\n" }, { "commit": "ffffa5eeb07ad42af768f78ec8cd7b44655873ab", "tree": "218d76420eac9666353037b65b417df9c2e33cce", "parents": [ "9c3040568536ffbc416f39202d723c18715a9ad2", "188e94625dfe42f2e963259b3eb1329f1a14c2d3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:36 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:36 2019 +0000" }, "message": "[automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9 am: 2f3fb2626c am: 188e94625d\n\nChange-Id: Ibfa7dfde9c015b0b019e5307585ae9807d22c7f4\n" }, { "commit": "188e94625dfe42f2e963259b3eb1329f1a14c2d3", "tree": "c10dfc2b61c476636f05df58ea8500d3973d585f", "parents": [ "56b857516b698a6ff10bdeb29ec4206a6bfe44a9", "2f3fb2626c0a12ce6e5b6b7e7ca0ccc15e39e5e3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:33 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:33 2019 +0000" }, "message": "[automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9 am: 2f3fb2626c\n\nChange-Id: I26ee46cf581470fdf596ded41fcc528a5789b7e2\n" }, { "commit": "2f3fb2626c0a12ce6e5b6b7e7ca0ccc15e39e5e3", "tree": "431c9d28e6cbe21fce7a633a7686e56ef91e833b", "parents": [ "e6fabf9be7508d16e589085e571e39b6d2cbc3d8", "f5dcf4dca93f6ccf5b08eccd4061f826930366dd" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:29 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:29 2019 +0000" }, "message": "[automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9\n\nChange-Id: I0b5d7b9bcca1dbbc062edcddcff9d9dd9a7feaf8\n" }, { "commit": "f5dcf4dca93f6ccf5b08eccd4061f826930366dd", "tree": "80ed1cb4853ff6ef677fca10a2725433e4337b68", "parents": [ "26fe734207aa6981a30fc259dc85a2ea7cc51522", "a7a8c35d92e6a97d13d5a018f5424c82951ebad2" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:26 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:26 2019 +0000" }, "message": "[automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92\n\nChange-Id: I74a9ffe9e4558d0fd9fbe011c88f06856f340ecb\n" }, { "commit": "a7a8c35d92e6a97d13d5a018f5424c82951ebad2", "tree": "dbf433735d220e5431357e232b4a3a3fc4f132af", "parents": [ "ffd550a63443db88a840fb211f616969532625a9", "f3808d3a2e8c646d5edad451a80daa61a4e5d836" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:22 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri May 31 21:12:22 2019 +0000" }, "message": "[automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e\n\nChange-Id: I2558d8f39c1590971d59f15bb78988e90a748bbf\n" }, { "commit": "f3808d3a2e8c646d5edad451a80daa61a4e5d836", "tree": "ded90eeb5fcb26bcd6f37ed1673756271d8d7e67", "parents": [ "24ea4727726adbeebfc5779614a3cb0e44208cde" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu May 30 19:07:47 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 31 14:11:16 2019 -0700" }, "message": "httplive: detect oom if playlist is infinite\n\nBug: 68399439\nTest: StagefrightTest#testStagefright_cve_2017_13279\nChange-Id: Icf39c2ae58d9d6ba7c74bbcfbe2154e66e6c9e40\n" }, { "commit": "806e1cbf2f40a7f308d639b5aff09dc0bedbd16a", "tree": "a89dc0f7d970c0c46a548ff8a3d5a609742bc944", "parents": [ "9c3040568536ffbc416f39202d723c18715a9ad2", "ec9f664d7bbe5ff91e368694f004a9d3c86834d3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu May 23 20:05:38 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu May 23 20:05:38 2019 +0000" }, "message": "[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88 am: ec9f664d7b\n\nChange-Id: I6b40d3da562e896569aff4981231055906ef96b0\n" }, { "commit": "ec9f664d7bbe5ff91e368694f004a9d3c86834d3", "tree": "c54a836abacb0f0336a5a09ce1585f9466b68e7e", "parents": [ "56b857516b698a6ff10bdeb29ec4206a6bfe44a9", "0d6a0e7d8882a45a435d73e16b40dde6d807a935" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu May 23 20:05:36 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu May 23 20:05:36 2019 +0000" }, "message": "[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88\n\nChange-Id: I27ce9e2b1bb78b7f716ac593cb98a4de9d77f5c3\n" } ], "next": "0d6a0e7d8882a45a435d73e16b40dde6d807a935" }