)]}' { "log": [ { "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": "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": "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": "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": "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" }, { "commit": "fba72ab0fcf7298492dcd9e3045913435d30d3a9", "tree": "2401cc720a2689ec6325fd8e34b5960c1e7b785b", "parents": [ "d437c77716fcf454d99b8424bb01f37643b970cc", "f394f12167fddbc755855d06b615509517c99f14" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Aug 28 21:08:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 28 21:08:45 2015 +0000" }, "message": "am f394f121: Merge \"libmedia: clear reply data for IEffect command\" into klp-dev\n\n* commit \u0027f394f12167fddbc755855d06b615509517c99f14\u0027:\n libmedia: clear reply data for IEffect command\n" }, { "commit": "f394f12167fddbc755855d06b615509517c99f14", "tree": "ba4c05bbdf64aa56ac6fc0c6bf789d23065b8b85", "parents": [ "0981df6e3db106bfb7a56a2b668c012fcc34dd2c", "57bed83a539535bb64a33722fb67231119cb0618" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Aug 28 20:49:57 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 28 20:49:57 2015 +0000" }, "message": "Merge \"libmedia: clear reply data for IEffect command\" into klp-dev" }, { "commit": "d437c77716fcf454d99b8424bb01f37643b970cc", "tree": "48e065894ed784e875e4005a6abfe75d71d99ac7", "parents": [ "f9a51893d739000cd70caf10c83d0e603371f5b1", "0981df6e3db106bfb7a56a2b668c012fcc34dd2c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Aug 27 21:45:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 27 21:45:45 2015 +0000" }, "message": "am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0\n\n* commit \u00270981df6e3db106bfb7a56a2b668c012fcc34dd2c\u0027:\n IMediaPlayer.cpp: make sure structures are initialized to 0\n" }, { "commit": "0981df6e3db106bfb7a56a2b668c012fcc34dd2c", "tree": "dc6913625ac7d7897ae45adecc82cd9e454ebb6b", "parents": [ "9a2be5d49d57b239bf6345f033eab01ba98f3889" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Aug 20 09:56:39 2015 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Aug 27 21:10:32 2015 +0000" }, "message": "IMediaPlayer.cpp: make sure structures are initialized to 0\n\nCredit https://code.google.com/p/android/issues/detail?id\u003d183310\n\nBug: 23515142\nChange-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427\n(cherry picked from commit b73b826cc16291b33649402497efbe0f946413bd)\n" }, { "commit": "57bed83a539535bb64a33722fb67231119cb0618", "tree": "d27a064540c9761fd8c2c5f804232596f07e8bae", "parents": [ "9a2be5d49d57b239bf6345f033eab01ba98f3889" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Aug 26 16:34:33 2015 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Aug 27 00:06:18 2015 +0000" }, "message": "libmedia: clear reply data for IEffect command\n\nBug: 23540907\nChange-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249\n" }, { "commit": "f9a51893d739000cd70caf10c83d0e603371f5b1", "tree": "59bfac3aa52dc9bf83a30b92611e50920d682786", "parents": [ "3a7ff4c754fcb99c29621ed94b08ed6fb65f6495", "9a2be5d49d57b239bf6345f033eab01ba98f3889" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 25 05:23:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 25 05:23:24 2015 +0000" }, "message": "am 9a2be5d4: Merge \"DO NOT MERGE - Fix software video decoder buffer size calculation\" into klp-dev\n\n* commit \u00279a2be5d49d57b239bf6345f033eab01ba98f3889\u0027:\n DO NOT MERGE - Fix software video decoder buffer size calculation\n" }, { "commit": "3a7ff4c754fcb99c29621ed94b08ed6fb65f6495", "tree": "fdabcece239722f3fc1c55f41bbbf7e77c87b91b", "parents": [ "0f3ab16c827a43534597cb38515951ff736f9740", "a5f50e98d1408addcaaac27e4d13981163d12a15" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 25 05:23:23 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 25 05:23:23 2015 +0000" }, "message": "am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n\n* commit \u0027a5f50e98d1408addcaaac27e4d13981163d12a15\u0027:\n DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n" }, { "commit": "9a2be5d49d57b239bf6345f033eab01ba98f3889", "tree": "e0417802932d787daf906e84938864898624c6be", "parents": [ "a5f50e98d1408addcaaac27e4d13981163d12a15", "0f3e2daa1d56c98196a719a6e641f3ed67b8e7bf" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 25 04:00:04 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 25 04:00:04 2015 +0000" }, "message": "Merge \"DO NOT MERGE - Fix software video decoder buffer size calculation\" into klp-dev" }, { "commit": "0f3e2daa1d56c98196a719a6e641f3ed67b8e7bf", "tree": "14f425887bc762b2a8d5f2d0dd521e931924eef0", "parents": [ "af7e33f6043c0be1c0310d675884e3b263ca2438" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 16 14:50:36 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 24 16:07:03 2015 -0700" }, "message": "DO NOT MERGE - Fix software video decoder buffer size calculation\n\nVarious software video decoders would specify the buffer size as if it were\nfully cropped, which then failed a sanity check in SoftwareRenderer.\nThey now return the full buffer size.\n\nBug: 21717327\nBug: 21443020\nChange-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5\n(cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)\n" }, { "commit": "a5f50e98d1408addcaaac27e4d13981163d12a15", "tree": "2706b904207936fc151c1de10781d614b1e5994b", "parents": [ "af7e33f6043c0be1c0310d675884e3b263ca2438" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Jun 08 14:01:42 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 24 22:40:48 2015 +0000" }, "message": "DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n\nBug: 21443020\nChange-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2\n(cherry picked from commit 760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)\n" }, { "commit": "0f3ab16c827a43534597cb38515951ff736f9740", "tree": "95080853408701da82e7bccc60632cb6fd655fb2", "parents": [ "09f71c5621799e0f030b4a8058d2fb4df5977de0", "af7e33f6043c0be1c0310d675884e3b263ca2438" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Sun Aug 23 19:08:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Aug 23 19:08:27 2015 +0000" }, "message": "am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp\n\n* commit \u0027af7e33f6043c0be1c0310d675884e3b263ca2438\u0027:\n libstagefright: check overflow before memory allocation in OMXCodec.cpp\n" }, { "commit": "09f71c5621799e0f030b4a8058d2fb4df5977de0", "tree": "e3f6d8a851739e695ddc2795dd9cd2366eef45c7", "parents": [ "eecc406f462ef2b3a73cd6bf3c05f7cb45382276", "dedaca6f04ac9f95fabe3b64d44cd1a2050f079e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sun Aug 23 19:08:25 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Aug 23 19:08:25 2015 +0000" }, "message": "am dedaca6f: Limit allocations to avoid out-of-memory\n\n* commit \u0027dedaca6f04ac9f95fabe3b64d44cd1a2050f079e\u0027:\n Limit allocations to avoid out-of-memory\n" }, { "commit": "af7e33f6043c0be1c0310d675884e3b263ca2438", "tree": "5f5f7e097366757a2640ddb0cc5f5b65090d5f0f", "parents": [ "dedaca6f04ac9f95fabe3b64d44cd1a2050f079e" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Aug 21 16:49:51 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Sun Aug 23 12:42:34 2015 +0000" }, "message": "libstagefright: check overflow before memory allocation in OMXCodec.cpp\n\nBug: 23416608\nChange-Id: I4dacd38ed42db8f4887c3ee386dc909451f4346f\n" }, { "commit": "dedaca6f04ac9f95fabe3b64d44cd1a2050f079e", "tree": "aac33f0ddaaae3cf66043bb3e801fc53a635afbe", "parents": [ "3b42241aab5855964d1bd60268ae21c2d9cc6065" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 04 11:01:15 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Fri Aug 21 21:34:14 2015 -0700" }, "message": "Limit allocations to avoid out-of-memory\n\nCorrupt files could cause very large allocations, limit them to something\nmore reasonable.\n\nBug: 17769851\nChange-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84\n" }, { "commit": "eecc406f462ef2b3a73cd6bf3c05f7cb45382276", "tree": "b2a5d72348212afbe32b9ee8a15ae34bbe1dfddb", "parents": [ "f814f84e09191af23bbf8d307f02704e20cc887c", "3b42241aab5855964d1bd60268ae21c2d9cc6065" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sat Aug 22 01:08:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 22 01:08:44 2015 +0000" }, "message": "am 3b42241a: Merge \"Prevent integer issues in ID3::Iterator::findFrame\" into klp-dev\n\n* commit \u00273b42241aab5855964d1bd60268ae21c2d9cc6065\u0027:\n Prevent integer issues in ID3::Iterator::findFrame\n" }, { "commit": "3b42241aab5855964d1bd60268ae21c2d9cc6065", "tree": "26b23cae8b66ba01e49d516e1ee7a19519dc949a", "parents": [ "d8816a13dbcafd5d61d26a8a6b2e892452bca1a7", "c580c836c1941fb4912e1dd4e08626caf98a62c7" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sat Aug 22 00:54:32 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 22 00:54:32 2015 +0000" }, "message": "Merge \"Prevent integer issues in ID3::Iterator::findFrame\" into klp-dev" }, { "commit": "c580c836c1941fb4912e1dd4e08626caf98a62c7", "tree": "11be8eb2577972b3c522503701a59af125ca0729", "parents": [ "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Joshua J. Drake", "email": "android-open-source@qoop.org", "time": "Sat Aug 15 08:17:03 2015 -0500" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Aug 21 16:06:23 2015 -0700" }, "message": "Prevent integer issues in ID3::Iterator::findFrame\n\nInteger overflows could occur a few places within findFrame. These can lead to\nout-of-bounds reads and potentially infinite loops. Ensure that arithmetic does\nnot wrap around to prevent these behaviors.\n\nBug: 23285192\nChange-Id: I72a61df7d5719d1d3f2bd0b37fba86f0f4bbedee\n" }, { "commit": "f814f84e09191af23bbf8d307f02704e20cc887c", "tree": "db92ff44d1d3c45e05b96db5b2f49942cf0c359e", "parents": [ "ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea", "d8816a13dbcafd5d61d26a8a6b2e892452bca1a7" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Aug 21 19:57:30 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 19:57:30 2015 +0000" }, "message": "am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n\n* commit \u0027d8816a13dbcafd5d61d26a8a6b2e892452bca1a7\u0027:\n DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n" }, { "commit": "d8816a13dbcafd5d61d26a8a6b2e892452bca1a7", "tree": "cfc5148417101a6c3b7008179ab6dd5b29b836d3", "parents": [ "8de6d690ae5843bd8e005deedea571596f79bbd3" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Jun 25 11:46:54 2015 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Aug 21 12:36:27 2015 -0700" }, "message": "DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n\n- The ABuffer used for the Message has a preset value of 1024, if\n flattening the meta data exceeds this value, a check fails hence\n the crash.\n- This change creates a new ABuffer if the buffer size would exceed\n the buffer capacity.\n\nBug: 22771132\n\nCRs-Fixed: 857850\n\n(cherry picked from commit 4bce636865bdf0e2a79fc9a5d9a69107649c850d)\n\nChange-Id: Ia0a963e9872f646791e75b710ff9e227a66af4f9\n" }, { "commit": "ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea", "tree": "f5e0756fd218a0e06e61ce391d2b61e6c88c555d", "parents": [ "fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059", "8de6d690ae5843bd8e005deedea571596f79bbd3" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 21 18:51:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 18:51:27 2015 +0000" }, "message": "am 8de6d690: Fix build break DO NOT MERGE\n\n* commit \u00278de6d690ae5843bd8e005deedea571596f79bbd3\u0027:\n Fix build break DO NOT MERGE\n" }, { "commit": "8de6d690ae5843bd8e005deedea571596f79bbd3", "tree": "de83a9d8986206f202dd2c34bd62116be39474d6", "parents": [ "c2153d0dc800d0718788dccd0f2a2d29f4647c03" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 21 09:58:12 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 21 18:32:29 2015 +0000" }, "message": "Fix build break DO NOT MERGE\n\nrelated-to-bug: 23223325\n\nChange-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1\n" }, { "commit": "fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059", "tree": "457d61467a5f2f5797b695565dfd3e46310f8534", "parents": [ "f839b2a33c46f3520684f0a839760cca36a6b4c7", "c2153d0dc800d0718788dccd0f2a2d29f4647c03" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 21 15:36:21 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 15:36:21 2015 +0000" }, "message": "am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere\n\n* commit \u0027c2153d0dc800d0718788dccd0f2a2d29f4647c03\u0027:\n DO NOT MERGE Part of fix for libmedia OOB write anywhere\n" }, { "commit": "c2153d0dc800d0718788dccd0f2a2d29f4647c03", "tree": "24cd6439538e4bf3fd0007757d86dbcb63a465a9", "parents": [ "5aa887ef44238e9a727564fe9051933f8b42e399" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 17 17:57:47 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 20 14:55:35 2015 -0700" }, "message": "DO NOT MERGE Part of fix for libmedia OOB write anywhere\n\nClarify that decrypt destination is not a pointer for\nsecure case.\n\nb/23223325\n\nChange-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac\n(cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)\n" }, { "commit": "f839b2a33c46f3520684f0a839760cca36a6b4c7", "tree": "ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79", "parents": [ "eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2", "5aa887ef44238e9a727564fe9051933f8b42e399" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 20:30:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 20:30:04 2015 +0000" }, "message": "am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00275aa887ef44238e9a727564fe9051933f8b42e399\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "5aa887ef44238e9a727564fe9051933f8b42e399", "tree": "45e6c5d00c653db833f26e6f14e2adb26cf3871c", "parents": [ "8a064aa83ad590b61ddd84e678c59f0d1f68106c", "59bfb7aa42ce2404da2547e7852e1a1215c6af22" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 20:17:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 20:17:34 2015 +0000" }, "message": "am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u002759bfb7aa42ce2404da2547e7852e1a1215c6af22\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "59bfb7aa42ce2404da2547e7852e1a1215c6af22", "tree": "f761d21bfae5e0e042ee41ae0fb43fc149850f07", "parents": [ "9d9491f9fb83523cfe68f2aa26c14f72f70812fc", "18a8124f582e9d763670e3bcc6ef6b2b00c4d394" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 20:11:03 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 20:11:03 2015 +0000" }, "message": "am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u002718a8124f582e9d763670e3bcc6ef6b2b00c4d394\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "18a8124f582e9d763670e3bcc6ef6b2b00c4d394", "tree": "62abbda0ae5ac64359add878f6adfbd59098b55e", "parents": [ "0dbd0d7bfe340ac46271c7f87969431b62a023ed", "da0a48d2704b231f13dbdb28cc4c4d12b08e3faf" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:53:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:53:55 2015 +0000" }, "message": "am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027da0a48d2704b231f13dbdb28cc4c4d12b08e3faf\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "da0a48d2704b231f13dbdb28cc4c4d12b08e3faf", "tree": "7a2fa8ee998e8d01518e93e19ba9090cd438df51", "parents": [ "c99244105803ac32f4cc698b5b2a85b225d925a2", "6020f06633f8cac09f47e561cc389c5b9b152464" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:46:41 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:46:41 2015 +0000" }, "message": "am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00276020f06633f8cac09f47e561cc389c5b9b152464\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "6020f06633f8cac09f47e561cc389c5b9b152464", "tree": "d40a01deb5043dbf7c1f01c29165f74719b1b717", "parents": [ "2fe61ed032e083dc39265f3b88274fcb8fbeed9b", "b294a97a6fed15d379ce11084166780e7d9dd883" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:41:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:41:14 2015 +0000" }, "message": "am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027b294a97a6fed15d379ce11084166780e7d9dd883\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "b294a97a6fed15d379ce11084166780e7d9dd883", "tree": "dcd7a6d38c54741226217640d97390577d0c841b", "parents": [ "3b8d3fa0dd97c05f77c4686986812e40203678d2", "6cba5819ab84cc58a8273428dcf9ae98c0c9bc42" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:32:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:32:06 2015 +0000" }, "message": "am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00276cba5819ab84cc58a8273428dcf9ae98c0c9bc42\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "6cba5819ab84cc58a8273428dcf9ae98c0c9bc42", "tree": "dcd7a6d38c54741226217640d97390577d0c841b", "parents": [ "186d1fb9b72439c1c3317d72e4a0f52f466e6861", "51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:25:42 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:25:42 2015 +0000" }, "message": "am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u002751bfaf6cf74498f92cd400e4d5b3d55b04fc7a06\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06", "tree": "065653ca656c926c0c7e8fcf2b3326cf80c0e196", "parents": [ "f4dfe12ecd26e7d6965a2abc062709b6d7d942c4", "1afea5517477554f452396c29db375e34d108f89" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:18:30 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:18:30 2015 +0000" }, "message": "am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00271afea5517477554f452396c29db375e34d108f89\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "1afea5517477554f452396c29db375e34d108f89", "tree": "0c15d1d2b118f34fc25eddbb80dcaacf73318c3f", "parents": [ "54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0", "ce73af077199122e0e5a80b019f949d0f181410f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 19:12:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 19:12:29 2015 +0000" }, "message": "am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027ce73af077199122e0e5a80b019f949d0f181410f\u0027:\n DO NOT MERGE Fail more gracefully on allocation failure\n" }, { "commit": "eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2", "tree": "ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79", "parents": [ "d7c205fe1f7cda2cdcb3062b548c0777402bab38", "8a064aa83ad590b61ddd84e678c59f0d1f68106c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 11:29:58 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 11:29:58 2015 -0700" }, "message": "resolved conflicts for merge of 8a064aa8 to klp-modular-dev\n\nChange-Id: If031955c9edca657401831fbfa5a128f0b4c6d86\n" }, { "commit": "8a064aa83ad590b61ddd84e678c59f0d1f68106c", "tree": "45e6c5d00c653db833f26e6f14e2adb26cf3871c", "parents": [ "522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31", "3878b990f7d53eae7c2cf9246b6ef2db5a049872" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 18:05:08 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 18:05:08 2015 +0000" }, "message": "Merge \"Fail more gracefully on allocation failure\" into klp-dev" }, { "commit": "ce73af077199122e0e5a80b019f949d0f181410f", "tree": "c8f1e5ccd45f35ef686e8136ea3451c53d36bba8", "parents": [ "aa8dab77aa9ef1bb6e5414ee5e773001de725bef" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 13 14:13:44 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 18:01:20 2015 +0000" }, "message": "DO NOT MERGE Fail more gracefully on allocation failure\n\nCheck allocations when the size is read from a file and might therefore\nbe invalid.\n\nb/14388161\n\nChange-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0\n" }, { "commit": "d7c205fe1f7cda2cdcb3062b548c0777402bab38", "tree": "7c2af71957bb9d7bd6f2c6131ef6144850db5f8c", "parents": [ "cb2acbfed69d18aa4693c03d8a77cd45daf8af8d", "522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 17:04:07 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 17:04:07 2015 +0000" }, "message": "am 522019f1: Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into klp-dev\n\n* commit \u0027522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31\u0027:\n libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\n" }, { "commit": "cb2acbfed69d18aa4693c03d8a77cd45daf8af8d", "tree": "b683fa63c6b937ee01f8eea4b9b6fef1a0047391", "parents": [ "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a", "635d38a84414e26aaf6c4b5df7859fde196adeaf" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Thu Aug 20 17:04:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 17:04:06 2015 +0000" }, "message": "am 635d38a8: Merge \"Check RTSP payload length\" into klp-dev\n\n* commit \u0027635d38a84414e26aaf6c4b5df7859fde196adeaf\u0027:\n Check RTSP payload length\n" }, { "commit": "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a", "tree": "437b24d2bc2cba6bc3bbefdfa80211be2c0bc75a", "parents": [ "a590baca031199327f6382347625dd232de2c95c", "2c880dde90e4303f9201f46124ee879325c57ba0" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Thu Aug 20 17:04:05 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 17:04:05 2015 +0000" }, "message": "am 2c880dde: Merge \"Sanity check padding/delay values for gapless playback\" into klp-dev\n\n* commit \u00272c880dde90e4303f9201f46124ee879325c57ba0\u0027:\n Sanity check padding/delay values for gapless playback\n" }, { "commit": "a590baca031199327f6382347625dd232de2c95c", "tree": "40c192b35abb2006e02b514fbb5a19fafc3370cd", "parents": [ "5221133bfa1585b4488b01cad165627b1cd17077", "6ae815e04f618207da9ce52e3c828492c33a7107" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 09:42:08 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 09:42:08 2015 -0700" }, "message": "Merge commit \u00276ae815e0\u0027 into HEAD\n\nlibstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n\nBug: 23270724\n(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)\n\nChange-Id: I44c642548ee6ba3745fb1f46d8645bece231035a\n" }, { "commit": "522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31", "tree": "bbed47079f06124d972e5f1d8bff8d00ea3b4794", "parents": [ "635d38a84414e26aaf6c4b5df7859fde196adeaf", "108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:27:23 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:27:23 2015 +0000" }, "message": "Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into klp-dev" }, { "commit": "635d38a84414e26aaf6c4b5df7859fde196adeaf", "tree": "e199c5f7c141ede4bf3a46996a9a6b70dfd8c0df", "parents": [ "2c880dde90e4303f9201f46124ee879325c57ba0", "4d46f6f18f5160b8992ec1e66ef1844212fc7d48" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Thu Aug 20 04:10:51 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:10:51 2015 +0000" }, "message": "Merge \"Check RTSP payload length\" into klp-dev" }, { "commit": "2c880dde90e4303f9201f46124ee879325c57ba0", "tree": "1046e8298b670c9aa23252f535fc3f9510bb2718", "parents": [ "6ae815e04f618207da9ce52e3c828492c33a7107", "ba6093a4c6997b9d36d9700ee8c974941bf82e3a" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Thu Aug 20 04:06:25 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:06:25 2015 +0000" }, "message": "Merge \"Sanity check padding/delay values for gapless playback\" into klp-dev" }, { "commit": "5221133bfa1585b4488b01cad165627b1cd17077", "tree": "6824c47d8b1cb36beb2c04f49e72a7aa1bcc7940", "parents": [ "6b52d191f96c611b768318eec74d25908da76d03", "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:04:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 04:04:08 2015 +0000" }, "message": "am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.\n\n* commit \u0027b2ae4351539de9aa4667fcb3e02ba40d9c6bd094\u0027:\n libstagefright: fix overflow in pvdec_api.cpp.\n" }, { "commit": "6ae815e04f618207da9ce52e3c828492c33a7107", "tree": "42f8cf5d811238df117abba1a9848b32c6f2d8fb", "parents": [ "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094", "937c6bedd4b6e5c6cb29a238eb459047dedd3486" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:01:18 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:01:18 2015 +0000" }, "message": "Merge \"libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\" into klp-dev" }, { "commit": "937c6bedd4b6e5c6cb29a238eb459047dedd3486", "tree": "de9072b197da1e8b0e7ebe6a0ea2f162237d191d", "parents": [ "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 14:32:16 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 03:53:44 2015 +0000" }, "message": "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n\nBug: 23270724\nChange-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4\n(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)\n" }, { "commit": "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094", "tree": "aa8ac42170bb5e669d625f7bc351327780feda61", "parents": [ "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 19 17:31:51 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 03:36:58 2015 +0000" }, "message": "libstagefright: fix overflow in pvdec_api.cpp.\n\nBug: 20674086\nChange-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3\n(cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)\n" }, { "commit": "4d46f6f18f5160b8992ec1e66ef1844212fc7d48", "tree": "e14bc1113d9b6ed64a615a67332fb937ab1403cb", "parents": [ "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 19 15:36:12 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 19 15:38:15 2015 -0700" }, "message": "Check RTSP payload length\n\nBug: 23346388\nChange-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08\n" }, { "commit": "108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860", "tree": "86860e2d3f5c7373f0e03a82c8deb5ee22f38a77", "parents": [ "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 11:17:24 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 19 11:48:19 2015 -0700" }, "message": "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\n\nBug: 23247055\nChange-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd\n(cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)\n" }, { "commit": "3878b990f7d53eae7c2cf9246b6ef2db5a049872", "tree": "30beb7e7b1bca4c232f781bf0e973ae6df450166", "parents": [ "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 13 14:13:44 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 19 09:39:02 2015 -0700" }, "message": "Fail more gracefully on allocation failure\n\nCheck allocations when the size is read from a file and might therefore\nbe invalid.\n\nb/14388161\n\nChange-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0\n" }, { "commit": "6b52d191f96c611b768318eec74d25908da76d03", "tree": "988dd6b443bf363307033e527734dbebf994d342", "parents": [ "5d7a381b9c86ff4f00a95063d57ad0a80467799c", "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:45:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 21:45:18 2015 +0000" }, "message": "am 916a9684: Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into klp-dev\n\n* commit \u0027916a9684295fb578f4b3c6c16b621ef201a49964\u0027:\n DO NOT MERGE - audio flinger: fix fuzz test crash\n" }, { "commit": "916a9684295fb578f4b3c6c16b621ef201a49964", "tree": "4c1a4cabe7ff1ebac46444e1d91bd4ae9b17a9c5", "parents": [ "877c76ac42701859fb8185f05c4724a06867fc07", "22ac20eff5b67f33b9d04ca54abeaa22ce201039" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:33:46 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 21:33:46 2015 +0000" }, "message": "Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into klp-dev" }, { "commit": "5d7a381b9c86ff4f00a95063d57ad0a80467799c", "tree": "a2aaa751fe9a7d39666587682be94896e3bd19ac", "parents": [ "9707195bf18fed1318e5c747db82f9783262a137", "877c76ac42701859fb8185f05c4724a06867fc07" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Aug 18 17:07:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 17:07:34 2015 +0000" }, "message": "am 877c76ac: Merge \"stagefright: check IMemory::pointer() before using the allocation\" into klp-dev\n\n* commit \u0027877c76ac42701859fb8185f05c4724a06867fc07\u0027:\n stagefright: check IMemory::pointer() before using the allocation\n" }, { "commit": "877c76ac42701859fb8185f05c4724a06867fc07", "tree": "01b5c74709088c02ad0be92c595c948dde5eb988", "parents": [ "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a", "8ec845c8fe0f03bc57c901bc484541bdd6a7cf80" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Aug 18 16:55:38 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 16:55:38 2015 +0000" }, "message": "Merge \"stagefright: check IMemory::pointer() before using the allocation\" into klp-dev" }, { "commit": "ba6093a4c6997b9d36d9700ee8c974941bf82e3a", "tree": "8f295f522d965924e9b4e4aff2c7d34a06dc4221", "parents": [ "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 18 09:55:24 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 18 09:55:24 2015 -0700" }, "message": "Sanity check padding/delay values for gapless playback\n\nBug: 23306638\nChange-Id: I2b5160e0f58f90d3f67c3964f41f5734ec0da053\n" }, { "commit": "9707195bf18fed1318e5c747db82f9783262a137", "tree": "07c0fa83b4cbab8d9e04e79abeaa7695b7e5ebd5", "parents": [ "27362395cec5673a9cbfe7179ad5490c4e475329", "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:40 2015 +0000" }, "message": "am f97b6bee: Merge \"Check integer overflow to prevent memory corruption\" into klp-dev\n\n* commit \u0027f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a\u0027:\n Check integer overflow to prevent memory corruption\n" }, { "commit": "27362395cec5673a9cbfe7179ad5490c4e475329", "tree": "e157babb6cdfb2579d9382b2ce2db7da23908611", "parents": [ "6035c811849a8475697268cf71b5cf923705abe8", "2ed42aea9c6fbca4bde52d647ff082b997b5968c" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "message": "am 2ed42aea: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev\n\n* commit \u00272ed42aea9c6fbca4bde52d647ff082b997b5968c\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a", "tree": "cc19b2094c6e098fab0ad87d96662963024038f5", "parents": [ "2ed42aea9c6fbca4bde52d647ff082b997b5968c", "b158a9a5bcfe21480f57bc58d45517f1a81cca39" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:04:20 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 15:04:20 2015 +0000" }, "message": "Merge \"Check integer overflow to prevent memory corruption\" into klp-dev" }, { "commit": "2ed42aea9c6fbca4bde52d647ff082b997b5968c", "tree": "f9029c9705e97eb235c53ba8f9d29cfe87b0f8fa", "parents": [ "0d46c93785e2c426be11172bec0489b698fea6c3", "734e65e6e7e1ee863781c1ebd87003933bb4a752" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:00:42 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 15:00:42 2015 +0000" }, "message": "Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev" }, { "commit": "6035c811849a8475697268cf71b5cf923705abe8", "tree": "b443bf98b8899119c9d7993a5340aa1c411bd083", "parents": [ "0afecdebaea1982ead120a701ddd24f2b0ff3897", "0d46c93785e2c426be11172bec0489b698fea6c3" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:31:25 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 14:31:25 2015 +0000" }, "message": "am 0d46c937: Merge \"MPEG4Source::fragmentedRead: check range before writing into buffers\" into klp-dev\n\n* commit \u00270d46c93785e2c426be11172bec0489b698fea6c3\u0027:\n MPEG4Source::fragmentedRead: check range before writing into buffers\n" }, { "commit": "0afecdebaea1982ead120a701ddd24f2b0ff3897", "tree": "223e4d668bbe88175f34d28aadf55200002901a5", "parents": [ "8026ad3838e2f7367e8ff616f66b2c2f8bc8488c", "aa1cc74139341eb3ae9511af5310b965dbf890f4" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:31:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 14:31:24 2015 +0000" }, "message": "am aa1cc741: Merge \"Check buffer size before using it\" into klp-dev\n\n* commit \u0027aa1cc74139341eb3ae9511af5310b965dbf890f4\u0027:\n Check buffer size before using it\n" }, { "commit": "0d46c93785e2c426be11172bec0489b698fea6c3", "tree": "d85768c73eae26399e188ee1fa069b7aac04c7ea", "parents": [ "aa1cc74139341eb3ae9511af5310b965dbf890f4", "f810a8298aea13fa177060cdc10c8297eac69c49" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:25:45 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 14:25:45 2015 +0000" }, "message": "Merge \"MPEG4Source::fragmentedRead: check range before writing into buffers\" into klp-dev" }, { "commit": "aa1cc74139341eb3ae9511af5310b965dbf890f4", "tree": "ad6d1edf7993e45e4aaa9c4412791cda0a192b07", "parents": [ "6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd", "f11e95b21007f24e5ab77298370855f9f085b2d7" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:24:26 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 14:24:26 2015 +0000" }, "message": "Merge \"Check buffer size before using it\" into klp-dev" }, { "commit": "8026ad3838e2f7367e8ff616f66b2c2f8bc8488c", "tree": "3747eda3e981b49ee24623909c9b4ceba0c2e656", "parents": [ "d146d4660451fb04c039f4ac8554103876fa4722", "6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:41:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:41:18 2015 +0000" }, "message": "am 6efa86be: Merge \"Check vector size before accessing\" into klp-dev\n\n* commit \u00276efa86beff54332cbf7bbd4949b0c38c1ec8c5cd\u0027:\n Check vector size before accessing\n" }, { "commit": "d146d4660451fb04c039f4ac8554103876fa4722", "tree": "86fa5fb0cd05e41c597a7b2700c5309be160cb49", "parents": [ "a2a6826494dec4a8fab6bd6828828fae886e516a", "6f561b93d8c6473fa0baa281ad4a53f882e656cc" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:36:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:36:34 2015 +0000" }, "message": "am 6f561b93: Merge \"MatroskaExtractor: detect infinite loop when parsing NALs\" into klp-dev\n\n* commit \u00276f561b93d8c6473fa0baa281ad4a53f882e656cc\u0027:\n MatroskaExtractor: detect infinite loop when parsing NALs\n" }, { "commit": "a2a6826494dec4a8fab6bd6828828fae886e516a", "tree": "3f90c877667c833507a014502693a0931f70ccbd", "parents": [ "073a656d7dd0b432e7c8d508745d9fb552955b9e", "c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b" ], "author": { "name": "Neel Mehta", "email": "nmehta@google.com", "time": "Tue Aug 18 13:36:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:36:33 2015 +0000" }, "message": "am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n\n* commit \u0027c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b\u0027:\n Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n" }, { "commit": "6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd", "tree": "c28630e1e229a01959f929c56894695525ff988d", "parents": [ "6f561b93d8c6473fa0baa281ad4a53f882e656cc", "073e4f6748f5d7deb095c42fad9271cb99e22d07" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:28:34 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 13:28:34 2015 +0000" }, "message": "Merge \"Check vector size before accessing\" into klp-dev" }, { "commit": "6f561b93d8c6473fa0baa281ad4a53f882e656cc", "tree": "6754377500a18f33e295c69bc0a46a9269e7d8c1", "parents": [ "c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b", "407d475b797fdc595299d67151230dc6e3835ccd" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:24:21 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 13:24:21 2015 +0000" }, "message": "Merge \"MatroskaExtractor: detect infinite loop when parsing NALs\" into klp-dev" }, { "commit": "407d475b797fdc595299d67151230dc6e3835ccd", "tree": "0924f43fb9ccf6ebbf227b9da67d74b570766307", "parents": [ "deba0610c89d54390c9d2d0a0f3b79fd7679779c" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 16 15:04:12 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 02:33:07 2015 +0000" }, "message": "MatroskaExtractor: detect infinite loop when parsing NALs\n\nBug: 21335999\nChange-Id: I76bd34610e52048ffcf16e41aa6175afc8a14ee4\n(cherry picked from commit 2dcf6138ebc9c5688aeae151d2fbde55a2826128)\n" }, { "commit": "c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b", "tree": "b29d7f3b35fcb42b4d696b2a1a68399e2758e52c", "parents": [ "deba0610c89d54390c9d2d0a0f3b79fd7679779c" ], "author": { "name": "Neel Mehta", "email": "nmehta@google.com", "time": "Fri Aug 14 17:38:48 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 02:12:26 2015 +0000" }, "message": "Fix for memory corruption in ID3::removeUnsynchronizationV2_4().\nBug: 23227354\n\nChange-Id: Iaa36cfda4fd84ca7e039f56086fd61b4118020db\n(cherry picked from commit 77e23413a539df16503e356bd4df4a952f3abc47)\n" }, { "commit": "073a656d7dd0b432e7c8d508745d9fb552955b9e", "tree": "e869c8904fae46cd6a7624e01bb04b7a69f39e68", "parents": [ "af46239a10921980f5030222dff147a592480248", "deba0610c89d54390c9d2d0a0f3b79fd7679779c" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 01:45:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:45:49 2015 +0000" }, "message": "am deba0610: Merge \"Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\" into klp-dev\n\n* commit \u0027deba0610c89d54390c9d2d0a0f3b79fd7679779c\u0027:\n Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\n" }, { "commit": "af46239a10921980f5030222dff147a592480248", "tree": "008f1fc8ecebb7c0b1b6a1244c579d67ff38d3a8", "parents": [ "431312997856ce689e683ee0639cf1f4bedab7f0", "9abb7401df730b5c510f6b8dac2716a0928d9623" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 01:45:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:45:48 2015 +0000" }, "message": "am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u00279abb7401df730b5c510f6b8dac2716a0928d9623\u0027:\n Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "deba0610c89d54390c9d2d0a0f3b79fd7679779c", "tree": "a483e8e26de32fe590d98811c3fa8e3aa37f6473", "parents": [ "9abb7401df730b5c510f6b8dac2716a0928d9623", "12bd1d2697f0d39f6c70f31d06f2f74c57e1d89f" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 01:31:42 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 01:31:42 2015 +0000" }, "message": "Merge \"Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\" into klp-dev" }, { "commit": "9abb7401df730b5c510f6b8dac2716a0928d9623", "tree": "5b02dde8e1c90ab3ecee53a26458b16bb28ae6bb", "parents": [ "1a09d3521e8849dcb1090ecb50393f6e9ee140ec" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 18:24:11 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 18:24:11 2015 -0700" }, "message": "Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\nBug: 20674086\nChange-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b\n" }, { "commit": "22ac20eff5b67f33b9d04ca54abeaa22ce201039", "tree": "e0fcb0e06bb14a3e9d34a514be6e912e6b6c8192", "parents": [ "1a09d3521e8849dcb1090ecb50393f6e9ee140ec" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 08 10:50:03 2015 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Aug 17 18:11:04 2015 -0700" }, "message": "DO NOT MERGE - audio flinger: fix fuzz test crash\n\nClear output stream pointer in duplicating thread\nwhen the main output to which it is attached is closed.\n\nAlso do not forward master mute and volume commands to\nduplicating threads as this is not applicable.\n\nAlso fix logic in AudioFlinger::primaryPlaybackThread_l()\nthat could accidentally return a duplicating thread.\nThis never happens because the primary thread is always\nfirst in the list.\n\nBug: 20731946.\nChange-Id: Ic8869699836920351b23d09544c50a258d3fb585\n" }, { "commit": "431312997856ce689e683ee0639cf1f4bedab7f0", "tree": "71c10c9a85888d7446f53d5a4c35b6056a94c380", "parents": [ "8a34499ab9987d962040881b4c8d66b655f65ae0", "1a09d3521e8849dcb1090ecb50393f6e9ee140ec" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:00:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:00:53 2015 +0000" }, "message": "am 1a09d352: Merge \"libstagefright: check remaining data size before parsing it.\" into klp-dev\n\n* commit \u00271a09d3521e8849dcb1090ecb50393f6e9ee140ec\u0027:\n libstagefright: check remaining data size before parsing it.\n" }, { "commit": "8a34499ab9987d962040881b4c8d66b655f65ae0", "tree": "6eef5c0ccecd1da4a3a9f0fee7b9c451761f8af9", "parents": [ "ce3802906214ec1ae2ac78d765b8480a2ebe295a", "c23e3dd8af7397f023aae040c4a03dd14091cbed" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 00:53:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:14 2015 +0000" }, "message": "am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u0027c23e3dd8af7397f023aae040c4a03dd14091cbed\u0027:\n Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "ce3802906214ec1ae2ac78d765b8480a2ebe295a", "tree": "91dcefa19420dc810d5313d70cd9981b3d1ac95e", "parents": [ "09c29ec42df51ae807725d4eea52c4cc305c13a0", "567b6551f8bc240cc267054ea5de55c46f10cc29" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:12 2015 +0000" }, "message": "am 567b6551: Merge \"SoftAVCEnc: check requested memory size before allocation.\" into klp-dev\n\n* commit \u0027567b6551f8bc240cc267054ea5de55c46f10cc29\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "09c29ec42df51ae807725d4eea52c4cc305c13a0", "tree": "c6e0949f6ad07dd9ca7b71f9ad611a13ea735f33", "parents": [ "5a289b87952f1cafbdcf604ad5e6da20403b38d5", "94c1969c38d4386933ed5cad7f625029442f6331" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 00:53:11 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:11 2015 +0000" }, "message": "am 94c1969c: Merge \"libstagefright: check memory size for overflow before allocation.\" into klp-dev\n\n* commit \u002794c1969c38d4386933ed5cad7f625029442f6331\u0027:\n libstagefright: check memory size for overflow before allocation.\n" }, { "commit": "5a289b87952f1cafbdcf604ad5e6da20403b38d5", "tree": "ad83f6152222eb3a63bd12a43d77ebc1e6220659", "parents": [ "6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2", "120f259d0de4dc048a2b9007c0f19b8808e59021" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:10 2015 +0000" }, "message": "am 120f259d: Merge \"ABuffer: reset members when memory allocation fails.\" into klp-dev\n\n* commit \u0027120f259d0de4dc048a2b9007c0f19b8808e59021\u0027:\n ABuffer: reset members when memory allocation fails.\n" }, { "commit": "6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2", "tree": "e5078ed566e1e69604ea697e55bc5b3dbe672799", "parents": [ "652926c8a37fb904aaa0756a0d0bae0574f308c5", "fc8c226b75a45876e6545c3a217698ada52bd2d6" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:09 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:09 2015 +0000" }, "message": "am fc8c226b: Merge \"Revert \"SoftAVCEnc: check requested memory size before allocation.\"\" into klp-dev\n\n* commit \u0027fc8c226b75a45876e6545c3a217698ada52bd2d6\u0027:\n Revert \"SoftAVCEnc: check requested memory size before allocation.\"\n" }, { "commit": "652926c8a37fb904aaa0756a0d0bae0574f308c5", "tree": "1323b1bde9c58a244c06669cfdb91d3dcc6f31c0", "parents": [ "b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68", "74d3170ffc02620fcedb5a98c7a66e83ee2faa87" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:08 2015 +0000" }, "message": "am 74d3170f: Merge \"Fix comparison sign warnings.\" into klp-dev\n\n* commit \u002774d3170ffc02620fcedb5a98c7a66e83ee2faa87\u0027:\n Fix comparison sign warnings.\n" }, { "commit": "b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68", "tree": "6af463d6368a2031a12873f8795d138160bf6a1d", "parents": [ "88aa97ea87b7e4f7b4f82df3500754e03205ef60", "479b4de0d267eb7d4c419f4da0069186a952ad17" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:07 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:07 2015 +0000" }, "message": "am 479b4de0: SoftAVCEnc: check requested memory size before allocation.\n\n* commit \u0027479b4de0d267eb7d4c419f4da0069186a952ad17\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "1a09d3521e8849dcb1090ecb50393f6e9ee140ec", "tree": "94569b4362815e1d20ffa4086499b9bc94f31d41", "parents": [ "c23e3dd8af7397f023aae040c4a03dd14091cbed", "d2ebc0b9e147f9406db20ec4df61da50e3614ee4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:48:01 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 00:48:01 2015 +0000" }, "message": "Merge \"libstagefright: check remaining data size before parsing it.\" into klp-dev" }, { "commit": "12bd1d2697f0d39f6c70f31d06f2f74c57e1d89f", "tree": "4413ef2ffe6e19f0db0bf807666c5e60163c3965", "parents": [ "c23e3dd8af7397f023aae040c4a03dd14091cbed" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 22:34:16 2015 +0000" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 22:34:16 2015 +0000" }, "message": "Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\n\nThis reverts commit c23e3dd8af7397f023aae040c4a03dd14091cbed.\n\nThis speculative fix didn\u0027t fix the compile failure, do checking locally.\n\nChange-Id: I1598f7208c8232ca38c0fcad17f211598591594e\n" } ], "next": "f810a8298aea13fa177060cdc10c8297eac69c49" }