)]}' { "log": [ { "commit": "8ac1a9f6d00193ab38feefed25cd4bcdbd7f045e", "tree": "bcfdadc26a1fc58938b3dd14edc8cee7964c167c", "parents": [ "e6bd186c7e2a3b948fdd27a4b71048ee85229e7c" ], "author": { "name": "Vignesh Venkatasubramanian", "email": "vigneshv@google.com", "time": "Fri Jan 15 09:47:27 2016 -0800" }, "committer": { "name": "Vignesh Venkatasubramanian", "email": "vigneshv@google.com", "time": "Wed Jan 20 16:52:41 2016 -0800" }, "message": "DO NOT MERGE - Remove deprecated image defines\n\nlibvpx has always supported the VPX_ prefixed versions of these defines.\nThe unprefixed versions have been removed in the most recent release.\n\nhttps://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10\n\nBUG\u003d23452792\n\nChange-Id: I8a656f2262f117d7a95271f45100b8c6fd0a470f\n" }, { "commit": "e6bd186c7e2a3b948fdd27a4b71048ee85229e7c", "tree": "5ad9e8c5ced3a5542c25e6ad57323e4163e84000", "parents": [ "3a9d4f4a83341e4c083aa50a651fe5d765ef70ad", "fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 12 22:56:21 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 12 22:56:21 2016 +0000" }, "message": "Fix out-of-bounds write am: 5403587a74\nam: fb2eb86102\n\n* commit \u0027fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6\u0027:\n Fix out-of-bounds write\n" }, { "commit": "fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6", "tree": "32df0477abbdb5465925ed77f15681a26501b238", "parents": [ "baebc739b0fe7257b26bfe105b67409559171c82", "5403587a74aee2fb57076528c3927851531c8afb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 12 22:54:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 12 22:54:38 2016 +0000" }, "message": "Fix out-of-bounds write\nam: 5403587a74\n\n* commit \u00275403587a74aee2fb57076528c3927851531c8afb\u0027:\n Fix out-of-bounds write\n" }, { "commit": "5403587a74aee2fb57076528c3927851531c8afb", "tree": "630f36eda2cf59c2fbc020e68f36cb23ac893b7c", "parents": [ "9e29523b9537983b4c4b205ff868d0b3bca0383b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 12 12:37:36 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 12 12:37:36 2016 -0800" }, "message": "Fix out-of-bounds write\n\nBug: 26365349\nChange-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b\n" }, { "commit": "3a9d4f4a83341e4c083aa50a651fe5d765ef70ad", "tree": "167fc6e0e51a5eaea14f37e87074f27dc3f97ac4", "parents": [ "c56555962b7e0fcee2dc0a058127f8f309f19ea8", "baebc739b0fe7257b26bfe105b67409559171c82" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jan 12 01:58:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 12 01:58:50 2016 +0000" }, "message": "fix possible overflow in effect wrappers. am: 9e29523b95\nam: baebc739b0\n\n* commit \u0027baebc739b0fe7257b26bfe105b67409559171c82\u0027:\n fix possible overflow in effect wrappers.\n" }, { "commit": "baebc739b0fe7257b26bfe105b67409559171c82", "tree": "e7204d25f9b5e74ddcd76bdf72e29bf412530371", "parents": [ "208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3", "9e29523b9537983b4c4b205ff868d0b3bca0383b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jan 12 01:56:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 12 01:56:51 2016 +0000" }, "message": "fix possible overflow in effect wrappers.\nam: 9e29523b95\n\n* commit \u00279e29523b9537983b4c4b205ff868d0b3bca0383b\u0027:\n fix possible overflow in effect wrappers.\n" }, { "commit": "9e29523b9537983b4c4b205ff868d0b3bca0383b", "tree": "e26b62c7419fe2a7f521d704e64e687a119441a2", "parents": [ "3d6a7149802928ecf3f58b7218b0e82699b492df" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Jan 08 10:52:38 2016 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jan 11 18:08:30 2016 +0000" }, "message": "fix possible overflow in effect wrappers.\n\nAdd checks on parameter size field in effect command handlers\nto avoid overflow leading to invalid comparison with min allowed\nsize for command and reply buffers.\n\nBug: 26347509.\nChange-Id: I20e6a9b6de8e5172b957caa1ac9410b9752efa4d\n(cherry picked from commit ad1bd92a49d78df6bc6e75bee68c517c1326f3cf)\n" }, { "commit": "208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3", "tree": "f24b4d3f782bf473dbeb70c5e4b579bc135eaa15", "parents": [ "9e1d7751b12ea976323abc1fe7760323ab142d39", "3d6a7149802928ecf3f58b7218b0e82699b492df" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\nam: 3d6a714980\n\n* commit \u00273d6a7149802928ecf3f58b7218b0e82699b492df\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "0c4d6937229096d530de7ef3fca496ac2d65c051", "tree": "af0242b197534a96d569c0396b63bc5f3991afa0", "parents": [ "4c0d24362609e9aa9f4f6afe6ee483d3d939f663", "19c47afbc402542720ddd280e1bbde3b2277b586" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:48:03 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 22:48:03 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev" }, { "commit": "3d6a7149802928ecf3f58b7218b0e82699b492df", "tree": "d1733d4792e95ae68ed843927cf38291863e4c42", "parents": [ "6afc659b00c3f4a83b9f5f3c744b7119b33340b4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 18:54:00 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "9e1d7751b12ea976323abc1fe7760323ab142d39", "tree": "55956286a4785e4d6b6efd5a090f149f0f9404eb", "parents": [ "781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e", "6afc659b00c3f4a83b9f5f3c744b7119b33340b4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\nam: 6afc659b00\n\n* commit \u00276afc659b00c3f4a83b9f5f3c744b7119b33340b4\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "6afc659b00c3f4a83b9f5f3c744b7119b33340b4", "tree": "68e7a24302e124cd3e267e2e467f9447e03c6fb3", "parents": [ "b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Nov 20 10:34:35 2015 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 09:40:33 2015 -0800" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n\nBug: 25812794\nChange-Id: I96dc74734380d462583f6efa33d09946f9532809\n(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)\n" }, { "commit": "0462975291796e414891e04bcec9da993914e458", "tree": "27e9f317a6af761a4026418d9decb059a4218b3f", "parents": [ "09c291c838bc74bb7c10c22f7232abb946cad8ff" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Nov 20 10:34:35 2015 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:40:16 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n\nBug: 25812794\nChange-Id: I96dc74734380d462583f6efa33d09946f9532809\n(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)\n" }, { "commit": "19c47afbc402542720ddd280e1bbde3b2277b586", "tree": "d2c3657298566f4466ea0f6ee51217ffe1a9b7a1", "parents": [ "09c291c838bc74bb7c10c22f7232abb946cad8ff" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 18:05:32 2015 -0800" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "09c291c838bc74bb7c10c22f7232abb946cad8ff", "tree": "e58cf3da585391a370ef02ed7940c5e6d6149607", "parents": [ "224858e719d045c8554856b12c4ab73d2375cf33" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 22 11:35:04 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 22 20:04:05 2015 +0000" }, "message": "GenericSource: reset mDecryptHandle when mDataSource is cleared.\n\nBug: 25070434\nChange-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484\n(cherry picked from commit cdc9cf656a8e43875234cb021fffeb4792d7c74e)\n" }, { "commit": "224858e719d045c8554856b12c4ab73d2375cf33", "tree": "7aae8271a085e360ad615823d09a2d293bec2649", "parents": [ "8565726f5775a6db97a394aa18a1f6b0e1ce69b7" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Oct 19 16:14:14 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 21 16:07:31 2015 +0000" }, "message": "GenericSource: reset mDrmManagerClient when mDataSource is cleared.\n\nBug: 25070434\nChange-Id: Iade3472c496ac42456e42db35e402f7b66416f5b\n(cherry picked from commit b41fd0d4929f0a89811bafcc4fd944b128f00ce2)\n" }, { "commit": "8565726f5775a6db97a394aa18a1f6b0e1ce69b7", "tree": "7e90c9176d5281969e07a6e2611292c237c09515", "parents": [ "f70b69a8b5ed044112516bf69f69905e521070b6", "781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Oct 20 21:19:00 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 20 21:19:00 2015 +0000" }, "message": "Merge \"stagefright: MPEG4Extractor: allow \\\u0027hdlr\\\u0027 box before first track\" into klp-dev am: b1a13d01dc\nam: 781cd4f37d\n\n* commit \u0027781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e\u0027:\n stagefright: MPEG4Extractor: allow \u0027hdlr\u0027 box before first track\n" }, { "commit": "781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e", "tree": "9e419be52af2e1d98ef404090af2f73ebfd108b1", "parents": [ "5a018d15da438933c30de4b25bcff527331cf8df", "b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Oct 20 21:12:16 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 20 21:12:16 2015 +0000" }, "message": "Merge \"stagefright: MPEG4Extractor: allow \\\u0027hdlr\\\u0027 box before first track\" into klp-dev\nam: b1a13d01dc\n\n* commit \u0027b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa\u0027:\n stagefright: MPEG4Extractor: allow \u0027hdlr\u0027 box before first track\n" }, { "commit": "b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa", "tree": "17fb9dd4a706a7d1cd6e58d1d39f87f652737c36", "parents": [ "0f21a6880e74b56834940a131df912a49b70e82d", "302b546bdccc777c1d3100510cd928e8bdf55fa5" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Oct 20 20:55:20 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 20 20:55:20 2015 +0000" }, "message": "Merge \"stagefright: MPEG4Extractor: allow \u0027hdlr\u0027 box before first track\" into klp-dev" }, { "commit": "dd184a4824acc31160895e2c6f8d93a7facfc2c8", "tree": "b59541270989719862e923d24637064ef10aa810", "parents": [ "fc0e2a87c17b1f326b5e3302e8f534c143fd5784", "3b4a72acf039c58c33807b6d6fcdd5e09eafb1df" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 16:48:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 08 16:48:33 2015 +0000" }, "message": "am 3b4a72ac: Merge \"DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\" into klp-dev\n\n* commit \u00273b4a72acf039c58c33807b6d6fcdd5e09eafb1df\u0027:\n DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n" }, { "commit": "04c02eeb0e5e5e4829df6946b275a770a8443330", "tree": "42a880a82cd035f0f064456202796e8b0ef92c95", "parents": [ "b75a78db916a7becf7e1b5ad15c0b4e667ef4661", "2482595baadd16f20d3992c8c9d6a14061836872" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 16:37:35 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 08 16:37:35 2015 +0000" }, "message": "Merge \"DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\" into lmp-dev" }, { "commit": "3b4a72acf039c58c33807b6d6fcdd5e09eafb1df", "tree": "a5850b7ca540008bc04e756192df47bcb6805729", "parents": [ "7ed8d1eff9b292b3c65a875b13a549e29654534b", "4a03d784f7c0e3a9685d182eee92ba6580eaf5a1" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 16:37:26 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 08 16:37:26 2015 +0000" }, "message": "Merge \"DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\" into klp-dev" }, { "commit": "2482595baadd16f20d3992c8c9d6a14061836872", "tree": "1b2d060855dc645f847ff2143e359166005f829a", "parents": [ "07395f4cd72cf29d1de2864cde42876db4e54411" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 07 13:53:25 2015 -0700" }, "message": "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)\n" }, { "commit": "4a03d784f7c0e3a9685d182eee92ba6580eaf5a1", "tree": "a7356ea6c85c6d1b4b45e0288f43b4f9fe9edae4", "parents": [ "74d1927e4122a1748f89ca2ef79406fc06ee94b2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 07 11:27:32 2015 -0700" }, "message": "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)\n" }, { "commit": "b75a78db916a7becf7e1b5ad15c0b4e667ef4661", "tree": "e6cf7dcf3854e0a4b0d3866063375869a2b05952", "parents": [ "07395f4cd72cf29d1de2864cde42876db4e54411", "fc0e2a87c17b1f326b5e3302e8f534c143fd5784" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 22:23:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 22:23:18 2015 +0000" }, "message": "am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.\n\n* commit \u0027fc0e2a87c17b1f326b5e3302e8f534c143fd5784\u0027:\n ID3: check possible integer overflow for extendedHeaderSize and paddingSize.\n" }, { "commit": "fc0e2a87c17b1f326b5e3302e8f534c143fd5784", "tree": "96ade437d2b8f49421a4d4d33dbb62f397a7d9ff", "parents": [ "00f5fa82d884c0ca41ee08e7a67ab54238109083", "7ed8d1eff9b292b3c65a875b13a549e29654534b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 22:17:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 22:17:52 2015 +0000" }, "message": "am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.\n\n* commit \u00277ed8d1eff9b292b3c65a875b13a549e29654534b\u0027:\n ID3: check possible integer overflow for extendedHeaderSize and paddingSize.\n" }, { "commit": "7ed8d1eff9b292b3c65a875b13a549e29654534b", "tree": "fa1bf26bacb7f6f89be4dc61fb81f8d3e402207e", "parents": [ "74d1927e4122a1748f89ca2ef79406fc06ee94b2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Oct 05 10:44:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 21:36:55 2015 +0000" }, "message": "ID3: check possible integer overflow for extendedHeaderSize and paddingSize.\n\nBug: 24623447\nChange-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1\n(cherry picked from commit b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca)\n" }, { "commit": "07395f4cd72cf29d1de2864cde42876db4e54411", "tree": "4cd400786003a0679e9ac67cfeef7b57c4212f63", "parents": [ "df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8", "00f5fa82d884c0ca41ee08e7a67ab54238109083" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 06 17:03:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 17:03:00 2015 +0000" }, "message": "am 00f5fa82: am 74d1927e: Merge \"Check NAL size before use\" into klp-dev\n\n* commit \u002700f5fa82d884c0ca41ee08e7a67ab54238109083\u0027:\n Check NAL size before use\n" }, { "commit": "00f5fa82d884c0ca41ee08e7a67ab54238109083", "tree": "6a9e3a3858170313feea1a35924e3f6786bbab82", "parents": [ "60b25aa0c173854593743dd85588c7449baf87c0", "74d1927e4122a1748f89ca2ef79406fc06ee94b2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 06 16:45:37 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 16:45:37 2015 +0000" }, "message": "am 74d1927e: Merge \"Check NAL size before use\" into klp-dev\n\n* commit \u002774d1927e4122a1748f89ca2ef79406fc06ee94b2\u0027:\n Check NAL size before use\n" }, { "commit": "df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8", "tree": "351e7418e7b246e6355d733dda07997985862758", "parents": [ "13b6b51e6d9c399f0bfa55be4eecaf47b63845f2", "60b25aa0c173854593743dd85588c7449baf87c0" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 16:38:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 16:38:51 2015 +0000" }, "message": "am 60b25aa0: am 9ab9c85e: Merge \"MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.\" into klp-dev\n\n* commit \u002760b25aa0c173854593743dd85588c7449baf87c0\u0027:\n MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.\n" }, { "commit": "74d1927e4122a1748f89ca2ef79406fc06ee94b2", "tree": "8d2c582f35035464af6a68c0d7be5657e391cd39", "parents": [ "9ab9c85e39f089f355faa9cd9db6d113dc482e61", "5d101298d8b0a78a1dc5bd26dbdada411f4ecd4d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 06 16:34:45 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 06 16:34:45 2015 +0000" }, "message": "Merge \"Check NAL size before use\" into klp-dev" }, { "commit": "60b25aa0c173854593743dd85588c7449baf87c0", "tree": "14e18563d6443bee5668cda55354ba61669c0590", "parents": [ "f7d1f627b0b1139f82f16baee482476cc10ccde4", "9ab9c85e39f089f355faa9cd9db6d113dc482e61" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 16:34:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 16:34:00 2015 +0000" }, "message": "am 9ab9c85e: Merge \"MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.\" into klp-dev\n\n* commit \u00279ab9c85e39f089f355faa9cd9db6d113dc482e61\u0027:\n MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.\n" }, { "commit": "9ab9c85e39f089f355faa9cd9db6d113dc482e61", "tree": "acc874f0654c62b26b9d38309e2ed68f94ab0dd3", "parents": [ "257b3bc581bbc65318a4cc2d3c22a07a4429dc1d", "e6d904fe5f6e7c7fc1d5fca2798dd3512468b118" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 16:21:35 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 06 16:21:35 2015 +0000" }, "message": "Merge \"MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.\" into klp-dev" }, { "commit": "13b6b51e6d9c399f0bfa55be4eecaf47b63845f2", "tree": "f0ec9a09c02ca435066be79f3a8ff2839e2de544", "parents": [ "91f5dc8fce9c37239216a01d78d771ef7592baa2", "f7d1f627b0b1139f82f16baee482476cc10ccde4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 06 15:54:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 15:54:38 2015 +0000" }, "message": "am f7d1f627: am 257b3bc5: Don\\\u0027t crash when there\\\u0027s no conceal frame\n\n* commit \u0027f7d1f627b0b1139f82f16baee482476cc10ccde4\u0027:\n Don\u0027t crash when there\u0027s no conceal frame\n" }, { "commit": "f7d1f627b0b1139f82f16baee482476cc10ccde4", "tree": "d66f3091347f78fa34e21a59454084f029e41cb1", "parents": [ "bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d", "257b3bc581bbc65318a4cc2d3c22a07a4429dc1d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 06 15:47:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 15:47:51 2015 +0000" }, "message": "am 257b3bc5: Don\\\u0027t crash when there\\\u0027s no conceal frame\n\n* commit \u0027257b3bc581bbc65318a4cc2d3c22a07a4429dc1d\u0027:\n Don\u0027t crash when there\u0027s no conceal frame\n" }, { "commit": "5d101298d8b0a78a1dc5bd26dbdada411f4ecd4d", "tree": "6ee149bea15ae8b0b8f279e510535efddc234fef", "parents": [ "3737a3fa121796131ea5b782230e65dad9ccf90f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Oct 02 15:12:00 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 06 07:48:29 2015 -0700" }, "message": "Check NAL size before use\n\nBug: 24441553\nBug: 24445122\nChange-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2\n" }, { "commit": "e6d904fe5f6e7c7fc1d5fca2798dd3512468b118", "tree": "0d14091afd78b81eafdcb7a2a6c82fb5b5952525", "parents": [ "3737a3fa121796131ea5b782230e65dad9ccf90f" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 14:50:47 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 02:54:39 2015 +0000" }, "message": "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.\n\nBug: 24346430\nChange-Id: I897a724e968841d9160f819d06c0ce22f6d743c4\n(cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)\n" }, { "commit": "257b3bc581bbc65318a4cc2d3c22a07a4429dc1d", "tree": "f0d526664edac8cab7fe9eb253262cd6661e7dda", "parents": [ "3737a3fa121796131ea5b782230e65dad9ccf90f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Oct 05 10:46:11 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Oct 05 11:21:58 2015 -0700" }, "message": "Don\u0027t crash when there\u0027s no conceal frame\n\nBug: 24630158\nChange-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6\n" }, { "commit": "302b546bdccc777c1d3100510cd928e8bdf55fa5", "tree": "35728701a097f499ac77277efa4bf9137c31e680", "parents": [ "3737a3fa121796131ea5b782230e65dad9ccf90f" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Aug 31 17:19:52 2015 -0700" }, "committer": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Fri Oct 02 20:41:47 2015 +0000" }, "message": "stagefright: MPEG4Extractor: allow \u0027hdlr\u0027 box before first track\n\nBug: 21725583\nChange-Id: I799c1967759c7e49fb50281a1708188450caac77\n(cherry picked from commit cf75af8f76265fb2909028f5dc68c7029dbe5f49)\n" }, { "commit": "bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d", "tree": "1f1c05590fa945764e44dacc9410d951a7ff9a41", "parents": [ "4554ffd7a1c4bc6973c11c00f5a19aa260e18100", "3737a3fa121796131ea5b782230e65dad9ccf90f" ], "author": { "name": "Flanker", "email": "i@flanker017.me", "time": "Tue Sep 29 06:28:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 29 06:28:47 2015 +0000" }, "message": "am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel\n\n* commit \u00273737a3fa121796131ea5b782230e65dad9ccf90f\u0027:\n DO NOT MERGE stagefright: fix AMessage::FromParcel\n" }, { "commit": "3737a3fa121796131ea5b782230e65dad9ccf90f", "tree": "44c68bc198e35edaf4a5c80620f5e68b58939dc0", "parents": [ "6272fa1baf361a6a89607243638cc592047947b3" ], "author": { "name": "Flanker", "email": "i@flanker017.me", "time": "Fri Sep 11 19:05:47 2015 +0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 25 17:53:35 2015 +0900" }, "message": "DO NOT MERGE stagefright: fix AMessage::FromParcel\n\nAdd check for incoming mNumItems. Also add check readCString return\nvalue.\n\nFix style \u0026 add log.\n\nBug: 24123723\n\nChange-Id: If41a5312c27d868f481893eef56019b6807c39b7\n" }, { "commit": "2b8cd9cbb3e72ffd048ffdd1609fac74f61a22ac", "tree": "9bc6b5e507d74c5a7fc6ea588520b209935aa22e", "parents": [ "a8f90d57f5b3ad4ef7194501aa20f0a0bd903e8f" ], "author": { "name": "Flanker", "email": "i@flanker017.me", "time": "Fri Sep 11 19:05:47 2015 +0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 25 01:47:10 2015 +0000" }, "message": "stagefright: fix AMessage::FromParcel\n\nAdd check for incoming mNumItems. Also add check readCString return\nvalue.\n\nFix style \u0026 add log.\n\nBug: 24123723\n\nChange-Id: If41a5312c27d868f481893eef56019b6807c39b7\n" }, { "commit": "a8f90d57f5b3ad4ef7194501aa20f0a0bd903e8f", "tree": "00b194d2ce4a0dcc37fea1082db5e7ef6d6cec90", "parents": [ "fb5104ec0cc11a50d1a56224cd1ca2950c2def45", "40715a2ee896edd2df4023d9f6f586977887d34c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 17 21:32:32 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 17 21:32:32 2015 +0000" }, "message": "Merge \"IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.\" into lmp-dev" }, { "commit": "4554ffd7a1c4bc6973c11c00f5a19aa260e18100", "tree": "f060c7688a407b2d2ba92ac03ffc56b0758f8ca5", "parents": [ "52b829cbc2cb947733f312211a007ecd2f9fe96b", "6272fa1baf361a6a89607243638cc592047947b3" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 17 17:28:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 17 17:28:47 2015 +0000" }, "message": "am 6272fa1b: Merge \"DO NOT MERGE Fix vulnerability in mediaserver\" into klp-dev\n\n* commit \u00276272fa1baf361a6a89607243638cc592047947b3\u0027:\n DO NOT MERGE Fix vulnerability in mediaserver\n" }, { "commit": "52b829cbc2cb947733f312211a007ecd2f9fe96b", "tree": "2a8e238b2dbadc4525217e7656c4827bae4d354b", "parents": [ "190786d3590c6b064a7d32eaa92f4a7b11cf16d5", "f43125ed08a408b02613b99f058564d97ce690cc" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 17 17:28:46 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 17 17:28:46 2015 +0000" }, "message": "am f43125ed: Merge \"Fix for security vulnerability in media server DO NOT MERGE\" into klp-dev\n\n* commit \u0027f43125ed08a408b02613b99f058564d97ce690cc\u0027:\n Fix for security vulnerability in media server DO NOT MERGE\n" }, { "commit": "160ed868d6beb0d55dc2194564d2f08cc9d6fbc2", "tree": "18ba63622c0c5f7bed51dddaf04190e1aeeae7d7", "parents": [ "99e63e75b670aeca1b4af401cb9582ba9fddf64d", "5e7e87a383fdb1fece977097a7e3cc51b296f3a0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 17 17:04:32 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 17 17:04:32 2015 +0000" }, "message": "Merge \"DO NOT MERGE Fix vulnerability in mediaserver\" into lmp-dev" }, { "commit": "6272fa1baf361a6a89607243638cc592047947b3", "tree": "e3f95e231ec43d93a06ff6bdd09f322bf5b305d4", "parents": [ "f43125ed08a408b02613b99f058564d97ce690cc", "636539eb1a0d407d7f82b7c9a6d9833f7715e287" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 17 17:04:25 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 17 17:04:25 2015 +0000" }, "message": "Merge \"DO NOT MERGE Fix vulnerability in mediaserver\" into klp-dev" }, { "commit": "99e63e75b670aeca1b4af401cb9582ba9fddf64d", "tree": "51f94e7d51f24250da47e55716f0e626bc769dd8", "parents": [ "13a8c5dd7f7437da67ecf8e2886e486191e95ff2", "4b219e9e5ab237eec9931497cf10db4d78982d84" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 17 17:04:15 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 17 17:04:15 2015 +0000" }, "message": "Merge \"Fix for security vulnerability in media server DO NOT MERGE\" into lmp-dev" }, { "commit": "f43125ed08a408b02613b99f058564d97ce690cc", "tree": "bffa33718f670773303388e5e69461b1a2ff1d09", "parents": [ "ae92251730865e0c4bc59ef2a8fe9dacb6de41b9", "9adc7283c84cea1be81d5bd55ce50aefa6328c6e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 17 17:04:05 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 17 17:04:05 2015 +0000" }, "message": "Merge \"Fix for security vulnerability in media server DO NOT MERGE\" into klp-dev" }, { "commit": "40715a2ee896edd2df4023d9f6f586977887d34c", "tree": "9b25806f7f91bad470fa77b390ca881ce964e320", "parents": [ "13a8c5dd7f7437da67ecf8e2886e486191e95ff2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Sep 16 15:01:16 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 17 16:15:19 2015 +0000" }, "message": "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.\n\nBug: 23953967\nChange-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829\n(cherry picked from commit 4cac44b53cc9f965cc2c9706b1d7ee2cd79f4066)\n" }, { "commit": "190786d3590c6b064a7d32eaa92f4a7b11cf16d5", "tree": "d10cf4ff409f32e9e59afe85240bcb91e1f0dbad", "parents": [ "38281f1cbcd4804095828f19b7954d5219560fcd", "ae92251730865e0c4bc59ef2a8fe9dacb6de41b9" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 17 13:36:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 17 13:36:52 2015 +0000" }, "message": "am ae922517: Merge \"DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.\" into klp-dev\n\n* commit \u0027ae92251730865e0c4bc59ef2a8fe9dacb6de41b9\u0027:\n DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.\n" }, { "commit": "5e7e87a383fdb1fece977097a7e3cc51b296f3a0", "tree": "667fbe8db495c12ef13f2cb2f197fab34bbe9a9c", "parents": [ "f3eb82683a80341f5ac23057aab733a57963cab2" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 16 10:26:28 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 16 10:26:28 2015 -0700" }, "message": "DO NOT MERGE Fix vulnerability in mediaserver\n\nICrypto.cpp: ASLR bypass using DECRYPT IPC\n\nbug: 24074485\nChange-Id: Ia12942d6b86adde28745908d36a728ab5d69a037\n" }, { "commit": "636539eb1a0d407d7f82b7c9a6d9833f7715e287", "tree": "815c5c0c5281a9de2c860da3cf1c62eea4d46b68", "parents": [ "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 16 10:23:12 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 16 10:23:56 2015 -0700" }, "message": "DO NOT MERGE Fix vulnerability in mediaserver\n\nICrypto.cpp: ASLR bypass using DECRYPT IPC\n\nbug: 24074485\nChange-Id: I40dd0e92083c7093030393b16dbab59323306a4e\n" }, { "commit": "3b76870d146b1350db8a2f7797e06897c8c92dc2", "tree": "21a471721a075c7848d738916f1fb293be2bb3e9", "parents": [ "cc0942d0c2a57c5025063c62689ee01b39736dc2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 10 09:47:29 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Sep 16 09:42:09 2015 -0700" }, "message": "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.\n\nBug: 23953967\nChange-Id: Ibbe841da149038675e9e8daea76c77558bc8564b\n(cherry picked from commit 983dca391a76fb45df999fc40e8766b9ddb63511)\n" }, { "commit": "8336fc433eee213e201c8a65bf2a65b65bc67c44", "tree": "f34fdbb0c5fb67bdef14493b565a04cdff95b738", "parents": [ "b21a642067477c72f419956da0ca8dafe0c04eab" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 10 09:47:29 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Sep 16 09:39:44 2015 -0700" }, "message": "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.\n\nBug: 23953967\nChange-Id: Ibbe841da149038675e9e8daea76c77558bc8564b\n(cherry picked from commit 983dca391a76fb45df999fc40e8766b9ddb63511)\n" }, { "commit": "9860dcdf427d70e6aef4ce082be40a5459c466f4", "tree": "1ddb4e4d2558774007d8e1befedab4e7d901785f", "parents": [ "8cfd0ac4b05f3151f1083564f46f05b5f525af8a", "b21a642067477c72f419956da0ca8dafe0c04eab" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 16 07:37:16 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 16 07:37:16 2015 +0000" }, "message": "am b21a6420: Merge \"DO NOT MERGE NuCachedSource2: fix possible erroneous early free\" into klp-dev\n\n* commit \u0027b21a642067477c72f419956da0ca8dafe0c04eab\u0027:\n DO NOT MERGE NuCachedSource2: fix possible erroneous early free\n" }, { "commit": "5c09132bf4d7e789256c9723fe2dfa15a6947bbb", "tree": "d9ff7330b142a9725f19a403b54cd1c4202ba976", "parents": [ "4855cc3dd5a057f435c5ce540a844e46ea76d758", "0d35dd2068d6422c3c77fb68f248cbabf3d0b10c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 16 07:11:18 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 16 07:11:18 2015 +0000" }, "message": "Merge \"DO NOT MERGE NuCachedSource2: fix possible erroneous early free\" into lmp-dev" }, { "commit": "b21a642067477c72f419956da0ca8dafe0c04eab", "tree": "0688e717f35bed31652ed83702110175bf9db1e8", "parents": [ "741a335126a562ae8f5883cc0b02ba72f40e56f3", "c894f81bdf106f648561e569e0dc97fc6046115b" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 16 07:11:04 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 16 07:11:04 2015 +0000" }, "message": "Merge \"DO NOT MERGE NuCachedSource2: fix possible erroneous early free\" into klp-dev" }, { "commit": "4b219e9e5ab237eec9931497cf10db4d78982d84", "tree": "062e4c9ffb383786c57f29fba05fea148cd0cf9b", "parents": [ "f3eb82683a80341f5ac23057aab733a57963cab2" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 11:55:43 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 18:59:06 2015 +0000" }, "message": "Fix for security vulnerability in media server DO NOT MERGE\n\nbug: 23540426\nChange-Id: I7ca419e4008967a0387649e5293ac9d4be71d3c4\n" }, { "commit": "9adc7283c84cea1be81d5bd55ce50aefa6328c6e", "tree": "fa5f35497c755ea43733c1c0f4f156f466eb5566", "parents": [ "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 10:18:56 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 18:58:37 2015 +0000" }, "message": "Fix for security vulnerability in media server DO NOT MERGE\n\nbug: 23540426\nChange-Id: I5d602f99fd82e50d0136d47ce20cfa1ac9fd7ae2\n" }, { "commit": "4855cc3dd5a057f435c5ce540a844e46ea76d758", "tree": "0b6e5fa893f78c009f3cf6c4fa6187982bd4d37a", "parents": [ "4022477b7c1e809d4ea31c47ae42555255a4ea4d", "820c105f7a4dc0971ee563caea4c9b346854a2f7" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Sep 14 06:30:56 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 14 06:30:56 2015 +0000" }, "message": "Merge \"DO NOT MERGE Avoid size_t overflow in base64 decoding once again\" into lmp-dev" }, { "commit": "0d35dd2068d6422c3c77fb68f248cbabf3d0b10c", "tree": "aafe76ddf9a0e1399a1791d8fbb721e9ec89efea", "parents": [ "4022477b7c1e809d4ea31c47ae42555255a4ea4d" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Sep 08 17:32:28 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Sep 14 13:54:51 2015 +0900" }, "message": "DO NOT MERGE NuCachedSource2: fix possible erroneous early free\n\nBecause the constructor of NuCachedSource2 sent a message to\nAHandlerReflector object, AHandlerReflector::onMessageReceived could\nhave executed just before the object gets wrapped in a strong\npointer, resulting in erroneous early free. Fix the issue by using\nstatic Create function to ensure the message is sent after the\nobject is wrapped in a sp.\n\nBug: 23882800\nChange-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855\n" }, { "commit": "c894f81bdf106f648561e569e0dc97fc6046115b", "tree": "38b63da21f7b2ae19a1e85ae56345eae3ad5a5ba", "parents": [ "69ae6a87342d5260d8d8660accc8aa1b9367dbbe" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Sep 08 17:32:28 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Sep 14 13:49:57 2015 +0900" }, "message": "DO NOT MERGE NuCachedSource2: fix possible erroneous early free\n\nBecause the constructor of NuCachedSource2 sent a message to\nAHandlerReflector object, AHandlerReflector::onMessageReceived could\nhave executed just before the object gets wrapped in a strong\npointer, resulting in erroneous early free. Fix the issue by using\nstatic Create function to ensure the message is sent after the\nobject is wrapped in a sp.\n\nBug: 23882800\nChange-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855\n" }, { "commit": "820c105f7a4dc0971ee563caea4c9b346854a2f7", "tree": "8e8187c77a0bc2e59f434046554fc62fb4ca146c", "parents": [ "b5611b843918a27ff8cac096ea044f486194e673" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 16:31:18 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Sep 14 11:28:21 2015 +0900" }, "message": "DO NOT MERGE Avoid size_t overflow in base64 decoding once again\n\nSwitch to foundation base64 function in OggExtractor and fix the\nissue there.\n\nThis reverts commit 28314aef9e8a666dbb75bbd555f6566a6c991f1c.\n\nBug: 23707088\nChange-Id: I268bd50431de5b5e579343bf1b425c42ada6daba\n" }, { "commit": "c5121002e5988ba1be660f3fbdb2067776b079fe", "tree": "72ba29a15f2425c09402c3de5ee0970745714023", "parents": [ "c191482ed3dd99db08f8c3864aa1c24bf1229e5c", "c256004a8cbf4dc1d647957243cf8be1a3c7bec4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Sat Sep 12 08:49:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Sep 12 08:49:17 2015 +0000" }, "message": "am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.\n\n* commit \u0027c256004a8cbf4dc1d647957243cf8be1a3c7bec4\u0027:\n libstagefright: fix A_Refl to return immediately when there is an error.\n" }, { "commit": "8cfd0ac4b05f3151f1083564f46f05b5f525af8a", "tree": "67fbf7b742b123d857ce7ff3444018a1af3f21ac", "parents": [ "44da08ed957157645e1c8776bb59924b1bb7f61c", "741a335126a562ae8f5883cc0b02ba72f40e56f3" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Sep 11 14:10:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 11 14:10:14 2015 +0000" }, "message": "am 741a3351: Merge \"DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\" into klp-dev\n\n* commit \u0027741a335126a562ae8f5883cc0b02ba72f40e56f3\u0027:\n DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\n" }, { "commit": "741a335126a562ae8f5883cc0b02ba72f40e56f3", "tree": "2df1757115ff30b3f7d7405c5cb94e4ee5e51082", "parents": [ "b659b4c7e1405056d189b44bd96036b6500dd378", "5f2a76f02f6d88825f8c164b4d9f7f310583eee1" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Sep 11 13:54:59 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 13:54:59 2015 +0000" }, "message": "Merge \"DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\" into klp-dev" }, { "commit": "44da08ed957157645e1c8776bb59924b1bb7f61c", "tree": "e327d4304eeaca78ce992e7ea2290eee75af2120", "parents": [ "1507bbb00e78c297b1aca01f580f529b55009f94", "b659b4c7e1405056d189b44bd96036b6500dd378" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 07:50:35 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 11 07:50:35 2015 +0000" }, "message": "am b659b4c7: Merge \"DO NOT MERGE fix build\" into klp-dev\n\n* commit \u0027b659b4c7e1405056d189b44bd96036b6500dd378\u0027:\n DO NOT MERGE fix build\n" }, { "commit": "b659b4c7e1405056d189b44bd96036b6500dd378", "tree": "a581c07dd31ddab5272bdf852bc6c1c2cc3c449d", "parents": [ "1784a8dbbc73b3e6033340d107b6c08478b962c8", "9104e704e43c9a6e691af52bb6f0aca71467979b" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 07:34:53 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 07:34:53 2015 +0000" }, "message": "Merge \"DO NOT MERGE fix build\" into klp-dev" }, { "commit": "9104e704e43c9a6e691af52bb6f0aca71467979b", "tree": "9e85f8d4112b4b89689d95721f103cda703ae4c2", "parents": [ "278ed118d5e6b0e216668551a5b8becdabd9aade" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 16:14:18 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 07:29:55 2015 +0000" }, "message": "DO NOT MERGE fix build\n\nBug: 23707088\n\nChange-Id: Ib0d6cbc52710f33310d21b2eae1f243f0f8e8bca\n" }, { "commit": "1507bbb00e78c297b1aca01f580f529b55009f94", "tree": "9558dd2c3ea632356b9b9255c7681413daf36e83", "parents": [ "c256004a8cbf4dc1d647957243cf8be1a3c7bec4", "1784a8dbbc73b3e6033340d107b6c08478b962c8" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 07:25:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 11 07:25:22 2015 +0000" }, "message": "am 1784a8db: Merge \"DO NOT MERGE Avoid size_t overflow in base64 decoding once again\" into klp-dev\n\n* commit \u00271784a8dbbc73b3e6033340d107b6c08478b962c8\u0027:\n DO NOT MERGE Avoid size_t overflow in base64 decoding once again\n" }, { "commit": "b5611b843918a27ff8cac096ea044f486194e673", "tree": "b0d65bc29abd7c55df8e8a38135fec58b894686a", "parents": [ "322e2dc56b48a8a06ce90e6a42dbf4491e3efec0", "28314aef9e8a666dbb75bbd555f6566a6c991f1c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 06:59:11 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 06:59:11 2015 +0000" }, "message": "Merge \"Revert \"Avoid size_t overflow in base64 decoding once again\"\" into lmp-dev" }, { "commit": "28314aef9e8a666dbb75bbd555f6566a6c991f1c", "tree": "472d338d65970f75ed5df6cddc4664e9e2a42d34", "parents": [ "c9ac5dfdafed1c66beae090cafa97002764e0ca3" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 06:51:10 2015 +0000" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 06:51:10 2015 +0000" }, "message": "Revert \"Avoid size_t overflow in base64 decoding once again\"\n\nThis reverts commit c9ac5dfdafed1c66beae090cafa97002764e0ca3.\n\nChange-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232\n" }, { "commit": "322e2dc56b48a8a06ce90e6a42dbf4491e3efec0", "tree": "3d2b1a489441404739d7d192da01ed247dd18ace", "parents": [ "f3eb82683a80341f5ac23057aab733a57963cab2", "c9ac5dfdafed1c66beae090cafa97002764e0ca3" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 06:49:37 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 06:49:37 2015 +0000" }, "message": "Merge \"Avoid size_t overflow in base64 decoding once again\" into lmp-dev" }, { "commit": "1784a8dbbc73b3e6033340d107b6c08478b962c8", "tree": "421940e11b66358fce3730df3c5b8c49423a9396", "parents": [ "69ae6a87342d5260d8d8660accc8aa1b9367dbbe", "278ed118d5e6b0e216668551a5b8becdabd9aade" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Sep 11 06:49:22 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 11 06:49:22 2015 +0000" }, "message": "Merge \"DO NOT MERGE Avoid size_t overflow in base64 decoding once again\" into klp-dev" }, { "commit": "c256004a8cbf4dc1d647957243cf8be1a3c7bec4", "tree": "bd7e3744dab54923ade5be5a4038c1832acd7056", "parents": [ "c1e989e76a461ea69e293839b3c29b634a462bd5", "69ae6a87342d5260d8d8660accc8aa1b9367dbbe" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 10 21:23:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 10 21:23:55 2015 +0000" }, "message": "am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.\n\n* commit \u002769ae6a87342d5260d8d8660accc8aa1b9367dbbe\u0027:\n libstagefright: fix A_Refl to return immediately when there is an error.\n" }, { "commit": "1c7719820359f4190cd4bfd1a24d521face7b4f8", "tree": "bdaea984bbd7c3def97f7bfc6719562a3ca94f9e", "parents": [ "f3eb82683a80341f5ac23057aab733a57963cab2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Sep 09 09:48:34 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 10 10:06:19 2015 -0700" }, "message": "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\n\nBug: 23905951\nBug: 23912202\nChange-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c\n(cherry picked from commit e995e477ad59b79145200c8f1e9e13c16c682d59)\n" }, { "commit": "5f2a76f02f6d88825f8c164b4d9f7f310583eee1", "tree": "ac667c1fa7c2f9a60bf01fc67154b9fcd874ca74", "parents": [ "69ae6a87342d5260d8d8660accc8aa1b9367dbbe" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Sep 09 09:48:34 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 10 10:03:56 2015 -0700" }, "message": "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\n\nBug: 23905951\nBug: 23912202\nChange-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c\n(cherry picked from commit e995e477ad59b79145200c8f1e9e13c16c682d59)\n" }, { "commit": "278ed118d5e6b0e216668551a5b8becdabd9aade", "tree": "c4680ca4e00f6932cb44c2b12618cc5dd4b9013f", "parents": [ "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Sep 07 15:52:27 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 09 17:13:31 2015 +0900" }, "message": "DO NOT MERGE Avoid size_t overflow in base64 decoding once again\n\nSwitch to foundation base64 function in OggExtractor and fix the\nissue there.\n\nBug: 23707088\nChange-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0\n" }, { "commit": "c9ac5dfdafed1c66beae090cafa97002764e0ca3", "tree": "c34b508863d34e9b38780663dec1061f032599fa", "parents": [ "2b63b91b84c75afdef4213aa11b0dcc8e7d735a3" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Sep 07 15:52:27 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 09 04:59:39 2015 +0000" }, "message": "Avoid size_t overflow in base64 decoding once again\n\nSwitch to foundation base64 function in OggExtractor and fix the\nissue there.\n\nBug: 23707088\nChange-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0\n" }, { "commit": "f3eb82683a80341f5ac23057aab733a57963cab2", "tree": "b0d65bc29abd7c55df8e8a38135fec58b894686a", "parents": [ "2b63b91b84c75afdef4213aa11b0dcc8e7d735a3" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 02 14:02:47 2015 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Sep 08 12:00:17 2015 -0700" }, "message": "DO NOT MERGE: Protect data source access with mutex during disconnect\n\nBug: 23658148\nChange-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd\n" }, { "commit": "69ae6a87342d5260d8d8660accc8aa1b9367dbbe", "tree": "42275af16d02cd3dbba6c7f3cfffa054a25da1ac", "parents": [ "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Sep 04 09:13:37 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Sep 08 09:06:04 2015 -0700" }, "message": "libstagefright: fix A_Refl to return immediately when there is an error.\n\nBug: 23609206\nChange-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22\n(cherry picked from commit 715dcb9c90d86c1a02a0da056f3cee8875ad1230)\n" }, { "commit": "2b63b91b84c75afdef4213aa11b0dcc8e7d735a3", "tree": "472d338d65970f75ed5df6cddc4664e9e2a42d34", "parents": [ "52a4fc09b483a20ee7d5970be01598ee262f7088", "c1e989e76a461ea69e293839b3c29b634a462bd5" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Sep 03 18:05:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 18:05:44 2015 +0000" }, "message": "am c1e989e7: am 13ff64c2: Merge \"Zero out return values in media binder calls\" into klp-dev\n\n* commit \u0027c1e989e76a461ea69e293839b3c29b634a462bd5\u0027:\n Zero out return values in media binder calls\n" }, { "commit": "52a4fc09b483a20ee7d5970be01598ee262f7088", "tree": "6df9c8ad33bffec0266be615e0162b15fcbe5e49", "parents": [ "7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f", "3732a3acafa7eb621bc26cca3eb00150ea12d2e2" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Sep 03 18:05:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 18:05:43 2015 +0000" }, "message": "am 3732a3ac: am ab203130: Merge \"Make IEffect command more robust (second try)\" into klp-dev\n\n* commit \u00273732a3acafa7eb621bc26cca3eb00150ea12d2e2\u0027:\n Make IEffect command more robust (second try)\n" }, { "commit": "7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f", "tree": "19c0b050a3e7a79d192ec6520ab977d9046a90ee", "parents": [ "75143f30b31a7b38362281d0bbf6109b0e423441", "16e12007ab1581e1b6aa973f3c83b2a45a816881" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Sep 03 18:05:42 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 18:05:42 2015 +0000" }, "message": "am 16e12007: am 74888428: Merge \"Fix timedtext parsing\" into klp-dev\n\n* commit \u002716e12007ab1581e1b6aa973f3c83b2a45a816881\u0027:\n Fix timedtext parsing\n" }, { "commit": "c1e989e76a461ea69e293839b3c29b634a462bd5", "tree": "f2285a73a3ae481533a578215ae6c6cef2c63fe1", "parents": [ "3732a3acafa7eb621bc26cca3eb00150ea12d2e2", "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Sep 03 17:52:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 17:52:44 2015 +0000" }, "message": "am 13ff64c2: Merge \"Zero out return values in media binder calls\" into klp-dev\n\n* commit \u002713ff64c2db84f4e7cac3396700e333b48c42c7ee\u0027:\n Zero out return values in media binder calls\n" }, { "commit": "3732a3acafa7eb621bc26cca3eb00150ea12d2e2", "tree": "867b54747e20ee05ebb5b59d655e952ac2b47247", "parents": [ "16e12007ab1581e1b6aa973f3c83b2a45a816881", "ab20313074bb109f29f677c3f09d5da1a48c94e7" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Sep 03 17:52:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 17:52:43 2015 +0000" }, "message": "am ab203130: Merge \"Make IEffect command more robust (second try)\" into klp-dev\n\n* commit \u0027ab20313074bb109f29f677c3f09d5da1a48c94e7\u0027:\n Make IEffect command more robust (second try)\n" }, { "commit": "16e12007ab1581e1b6aa973f3c83b2a45a816881", "tree": "9da41b0e4128f745378921241ba9a4fafd5f04cc", "parents": [ "03b7f72b98ef0a4fa58a84a27d2f8735342faf58", "74888428e51a2aa123e301912d09973bd9310c33" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Sep 03 17:52:42 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 17:52:42 2015 +0000" }, "message": "am 74888428: Merge \"Fix timedtext parsing\" into klp-dev\n\n* commit \u002774888428e51a2aa123e301912d09973bd9310c33\u0027:\n Fix timedtext parsing\n" }, { "commit": "13ff64c2db84f4e7cac3396700e333b48c42c7ee", "tree": "626467528e2ff75d1d312d6879988b5ec25eaab9", "parents": [ "ab20313074bb109f29f677c3f09d5da1a48c94e7", "892354335d49f0b9fcd10e20e0c13e3cd0f1f1cb" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Sep 03 17:21:20 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 17:21:20 2015 +0000" }, "message": "Merge \"Zero out return values in media binder calls\" into klp-dev" }, { "commit": "ab20313074bb109f29f677c3f09d5da1a48c94e7", "tree": "43eff05e498917c23428409d1ce19603572d2155", "parents": [ "74888428e51a2aa123e301912d09973bd9310c33", "25a634427dec455b79d73562131985ae85b98c43" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Sep 03 17:16:12 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 17:16:12 2015 +0000" }, "message": "Merge \"Make IEffect command more robust (second try)\" into klp-dev" }, { "commit": "03b7f72b98ef0a4fa58a84a27d2f8735342faf58", "tree": "1d5475ace4b2d3e57e6ae41a52d9560765a3ce81", "parents": [ "436b32d1eb75cf20d09776549bd7f7a11fa569a1", "9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 03 17:14:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 17:14:06 2015 +0000" }, "message": "am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\n* commit \u00279d916c771ca32cb2d0df27b85ce3e17bb6b48eaf\u0027:\n DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n" }, { "commit": "74888428e51a2aa123e301912d09973bd9310c33", "tree": "44d2d37355a454f5acf1e19945f7604a9278b688", "parents": [ "9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf", "d53aced041b7214a92b1f2fd5970d895bb9934e5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Sep 03 17:05:55 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 17:05:55 2015 +0000" }, "message": "Merge \"Fix timedtext parsing\" into klp-dev" }, { "commit": "c6a2815eadfce62702d58b3fa3887f24c49e1864", "tree": "3f9a78756af8a9ef4abb722b06bb51555f194afb", "parents": [ "a6c650a9e7927c7d640828cea66fc96e0bf762ce" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Sep 01 11:14:18 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 03 09:06:37 2015 -0700" }, "message": "DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\nAlso remove some CHECK\u0027s.\n\nBug: 23680780\nChange-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23\n(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)\n" }, { "commit": "9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf", "tree": "2c077303c6072c6d648b9a1b68fb0607fc1afe5e", "parents": [ "d26052738f7b095b7e318c8dde7f32db0a48450c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Sep 01 11:14:18 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Sep 03 09:03:40 2015 -0700" }, "message": "DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\nAlso remove some CHECK\u0027s.\n\nBug: 23680780\nChange-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23\n(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)\n" }, { "commit": "a6c650a9e7927c7d640828cea66fc96e0bf762ce", "tree": "ab700d0c3982672a194355220089d5d907e04507", "parents": [ "184ad88ddd6bbdf01e131e8e5b75bef5be67b29b", "436b32d1eb75cf20d09776549bd7f7a11fa569a1" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Sep 03 07:59:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 07:59:29 2015 +0000" }, "message": "am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding\n\n* commit \u0027436b32d1eb75cf20d09776549bd7f7a11fa569a1\u0027:\n Ogg: avoid size_t overflow in base64 decoding\n" }, { "commit": "436b32d1eb75cf20d09776549bd7f7a11fa569a1", "tree": "11aa076f3e6dd893ee4072d8d47ff22eb57896cc", "parents": [ "fba72ab0fcf7298492dcd9e3045913435d30d3a9", "d26052738f7b095b7e318c8dde7f32db0a48450c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Sep 03 07:54:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 03 07:54:01 2015 +0000" }, "message": "am d2605273: Ogg: avoid size_t overflow in base64 decoding\n\n* commit \u0027d26052738f7b095b7e318c8dde7f32db0a48450c\u0027:\n Ogg: avoid size_t overflow in base64 decoding\n" }, { "commit": "d26052738f7b095b7e318c8dde7f32db0a48450c", "tree": "1b405a0f494c813126156bff30de0ebf0d6454c4", "parents": [ "f394f12167fddbc755855d06b615509517c99f14" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 02 16:02:19 2015 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Sep 03 06:15:02 2015 +0000" }, "message": "Ogg: avoid size_t overflow in base64 decoding\n\nBug: 23707088\nChange-Id: I8d32841fee3213c721cdcc57788807ea64d19d74\n" }, { "commit": "892354335d49f0b9fcd10e20e0c13e3cd0f1f1cb", "tree": "fc309fc843d7c9a627b59f0771c02edf4d1375ba", "parents": [ "f394f12167fddbc755855d06b615509517c99f14" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 02 16:46:59 2015 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 02 17:48:22 2015 -0700" }, "message": "Zero out return values in media binder calls\n\nMore specifically when handling:\n* GET_STREAM_VOLUME in IAudioPolicyService, and\n* GET_CURRENT_POSITION and GET_DURATION in IMediaPlayer\n\nThis prevents leaking uninitialized values across binder in error cases.\n\nBug: 23756261\nChange-Id: I0ffd900ab12b685b0611259ade4a3efb1ec5defe\n" }, { "commit": "25a634427dec455b79d73562131985ae85b98c43", "tree": "7eb4fe76d2239352ae39bf4ce75d7dc4f5e0d4bc", "parents": [ "f394f12167fddbc755855d06b615509517c99f14" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Sep 01 20:07:56 2015 +0000" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Sep 02 17:52:12 2015 +0000" }, "message": "Make IEffect command more robust (second try)\n\nBug: 23540907\nChange-Id: If30cfa535ad51521053706fc40fc98d893db5bc7\n(cherry picked from commit 10e6660cc5da65b027c90489ba7ac55d1504e012)\n" }, { "commit": "d53aced041b7214a92b1f2fd5970d895bb9934e5", "tree": "fbbe3de134e7cb9f5c84034d95ef047988f22cfd", "parents": [ "f394f12167fddbc755855d06b615509517c99f14" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 27 13:49:32 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Aug 31 15:12:35 2015 +0000" }, "message": "Fix timedtext parsing\n\nAdd bounds checking and fix other bugs.\n\nBug: 23284974\nBug: 23541506\nBug: 23542351\nBug: 23542352\nChange-Id: I53551efdf109ce1833e0c361efaf4cee7a851023\n" } ], "next": "184ad88ddd6bbdf01e131e8e5b75bef5be67b29b" }