)]}' { "log": [ { "commit": "b71a431eabce5983ccd3efadeb024b8ed08bb89d", "tree": "4d014fb84dffd894ca5b8f86439de50388f6cc6d", "parents": [ "e40e452a3a7ab31e408d023ab7b4ad1fa65d01c5", "920b0f7887c5b8f8b1b7670c91f9ceedd9ad9cf2" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Aug 19 02:43:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 19 02:43:37 2016 +0000" }, "message": "DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b\nam: 920b0f7887\n\nChange-Id: I603ab931f82d8a83187be989dccb8686de8bf95e\n" }, { "commit": "920b0f7887c5b8f8b1b7670c91f9ceedd9ad9cf2", "tree": "c7c79de964e565c3e8f4d0dad81aa1fd68a5544f", "parents": [ "8df5df78a3e19c04e389749794f33bfc2a8396cf", "940829f69b52d6038db66a9c727534636ecc456d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Aug 19 02:40:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 19 02:40:37 2016 +0000" }, "message": "DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.\nam: 940829f69b\n\nChange-Id: I3df8797998bac785ad198cb4fb2401779a3947ff\n" }, { "commit": "940829f69b52d6038db66a9c727534636ecc456d", "tree": "c7c79de964e565c3e8f4d0dad81aa1fd68a5544f", "parents": [ "17a10c50e20d934c1ac5956fe9019d3013e3f8b3" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon Jul 18 20:12:02 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Aug 17 12:43:37 2016 +0000" }, "message": "DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.\n\nAlso prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.\n\nBug: 30033990\nChange-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2\n(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)\n" }, { "commit": "e40e452a3a7ab31e408d023ab7b4ad1fa65d01c5", "tree": "f3f5b4ab334da095c9ef62c6faa5f0d007723761", "parents": [ "f054728108e7ec42d05260c5b1fb045e54553704", "8df5df78a3e19c04e389749794f33bfc2a8396cf" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Aug 01 20:30:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 01 20:30:39 2016 +0000" }, "message": "DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2\nam: 8df5df78a3\n\nChange-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b\n" }, { "commit": "8df5df78a3e19c04e389749794f33bfc2a8396cf", "tree": "8345b0aae2d50a442a6900b4e428242b8c556630", "parents": [ "c83b53c9e5a45083fe77781948bc6b52a623f4b8", "17a10c50e20d934c1ac5956fe9019d3013e3f8b3" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Aug 01 20:28:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 01 20:28:10 2016 +0000" }, "message": "DO NOT MERGE - stagefright: fix integer overflow error\nam: 17a10c50e2\n\nChange-Id: I310e406b5370678b112f5ad0603e22456d6c3de7\n" }, { "commit": "17a10c50e20d934c1ac5956fe9019d3013e3f8b3", "tree": "8345b0aae2d50a442a6900b4e428242b8c556630", "parents": [ "2b94fa82778cef72f810035840dd60db189be341" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Jul 21 14:43:38 2016 +0900" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Jul 29 17:37:19 2016 -0700" }, "message": "DO NOT MERGE - stagefright: fix integer overflow error\n\nBug: 30103394\nChange-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408\n(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)\n" }, { "commit": "f054728108e7ec42d05260c5b1fb045e54553704", "tree": "f488279940082b276d5e449065cd59fe3878126c", "parents": [ "1038762b09aabc3e049b4bdb664c2c6b03008145", "c83b53c9e5a45083fe77781948bc6b52a623f4b8" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jul 19 22:46:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 19 22:46:54 2016 +0000" }, "message": "omx: prevent input port enable/disable for software codecs am: 2b94fa8277\nam: c83b53c9e5\n\nChange-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0\n" }, { "commit": "c83b53c9e5a45083fe77781948bc6b52a623f4b8", "tree": "fafac7b159ce25f41568af4c3f061e8548799633", "parents": [ "98b31b92704777d0c8fe712ece5006e8bcf3070e", "2b94fa82778cef72f810035840dd60db189be341" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jul 19 22:44:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 19 22:44:18 2016 +0000" }, "message": "omx: prevent input port enable/disable for software codecs\nam: 2b94fa8277\n\nChange-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44\n" }, { "commit": "2b94fa82778cef72f810035840dd60db189be341", "tree": "fafac7b159ce25f41568af4c3f061e8548799633", "parents": [ "bf835e452528600052fa5607c7bc8ae85bd81d67" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Jul 07 12:57:02 2016 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jul 19 04:04:43 2016 +0000" }, "message": "omx: prevent input port enable/disable for software codecs\n\nBug: 29421804\nChange-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f\n" }, { "commit": "1038762b09aabc3e049b4bdb664c2c6b03008145", "tree": "3d8f01a5bc7577674aa087b0cdc0a8f8ad1cb403", "parents": [ "e3c1c2d73474953a953185bd3cb2e9f502d1bdd4", "98b31b92704777d0c8fe712ece5006e8bcf3070e" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 23:01:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 23:01:31 2016 +0000" }, "message": "DO NOT MERGE - Fix build am: bf835e4525\nam: 98b31b9270\n\nChange-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b\n" }, { "commit": "98b31b92704777d0c8fe712ece5006e8bcf3070e", "tree": "d4a8e5149a4d07e7c674251591aa279bdd470ae6", "parents": [ "f4ad14f1546dd831137fd61af55f8b7b97d9f37a", "bf835e452528600052fa5607c7bc8ae85bd81d67" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 22:58:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 22:58:30 2016 +0000" }, "message": "DO NOT MERGE - Fix build\nam: bf835e4525\n\nChange-Id: Idd0b7779345c8b4c595681de7431c3339b44129e\n" }, { "commit": "bf835e452528600052fa5607c7bc8ae85bd81d67", "tree": "d4a8e5149a4d07e7c674251591aa279bdd470ae6", "parents": [ "3242dcf6e9f5e01fa2e4fd78feb5db7ec385469d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 15:32:08 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 22:33:41 2016 +0000" }, "message": "DO NOT MERGE - Fix build\n\nChange-Id: Iff47bb735778fb275abeee573c636856b839feb5\n" }, { "commit": "e3c1c2d73474953a953185bd3cb2e9f502d1bdd4", "tree": "374b97272a53d9a9199d7591a86819a1ca85283b", "parents": [ "6bdf8cb4402fb0ed3b46820e8c19a50d40f19803", "f4ad14f1546dd831137fd61af55f8b7b97d9f37a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:37:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 01:37:58 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am: 3242dcf6e9\nam: f4ad14f154\n\nChange-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450\n" }, { "commit": "f4ad14f1546dd831137fd61af55f8b7b97d9f37a", "tree": "2320cbb63ecec044f64c2462e202340336d1d366", "parents": [ "74b10b831c8c6f5ad935b7918e35870de7e3ca5a", "3242dcf6e9f5e01fa2e4fd78feb5db7ec385469d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:31:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 01:31:29 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev\nam: 3242dcf6e9\n\nChange-Id: I09c381c92c7efeacc95c611b2775d875a6202027\n" }, { "commit": "3242dcf6e9f5e01fa2e4fd78feb5db7ec385469d", "tree": "2320cbb63ecec044f64c2462e202340336d1d366", "parents": [ "91ad8847ab8c4d6c2e6fadf1978d2dd838eeafeb", "bce5cc9f9d071e1bd5c6c9194a3c8ee289d2d9a1" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:26:14 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 14 01:26:14 2016 +0000" }, "message": "Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev" }, { "commit": "6bdf8cb4402fb0ed3b46820e8c19a50d40f19803", "tree": "03a4114f4b188fb5c9337e43ffceeb13e3dad326", "parents": [ "c9c40b829f4a555fcff520d265e2e60ac40ffb7e", "74b10b831c8c6f5ad935b7918e35870de7e3ca5a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:25:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 01:25:31 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\" into klp-dev am: 91ad8847ab\nam: 74b10b831c\n\nChange-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2\n" }, { "commit": "c9c40b829f4a555fcff520d265e2e60ac40ffb7e", "tree": "1e891235a4237e06f388f8cc5314f1b4e4400081", "parents": [ "efa1272404186a7c191d120a18b5f4ffcbbccdaf", "d89781f3becbfdb1283d9b77e2cb308c1c37e516" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:25:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 01:25:30 2016 +0000" }, "message": "Merge \\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\" into klp-dev am: f545c72b97\nam: d89781f3be\n\nChange-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6\n" }, { "commit": "74b10b831c8c6f5ad935b7918e35870de7e3ca5a", "tree": "f9df0a0a69d601b84d740fc39d291119af803b20", "parents": [ "d89781f3becbfdb1283d9b77e2cb308c1c37e516", "91ad8847ab8c4d6c2e6fadf1978d2dd838eeafeb" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:22:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 01:22:56 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev\nam: 91ad8847ab\n\nChange-Id: I66eec25f4bc143dd5d67b9bb77825f6e6c732880\n" }, { "commit": "d89781f3becbfdb1283d9b77e2cb308c1c37e516", "tree": "dc90c7d125cfcdd8c826fbdcad15d4ece754fd66", "parents": [ "357e0f132efdf28cfbe1611ecc03ad332306fa43", "f545c72b97671b6030946c86758cdb87d22a302d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:22:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 01:22:56 2016 +0000" }, "message": "Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev\nam: f545c72b97\n\nChange-Id: I9206ce86485cb3acc2540d135f6beacc03bb38f5\n" }, { "commit": "91ad8847ab8c4d6c2e6fadf1978d2dd838eeafeb", "tree": "f9df0a0a69d601b84d740fc39d291119af803b20", "parents": [ "f545c72b97671b6030946c86758cdb87d22a302d", "b8676258c1c04cfb2c5a87d00b1b8fe85309b2a9" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:18:10 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 14 01:18:10 2016 +0000" }, "message": "Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev" }, { "commit": "f545c72b97671b6030946c86758cdb87d22a302d", "tree": "dc90c7d125cfcdd8c826fbdcad15d4ece754fd66", "parents": [ "b5299033cec510aac9b636cb6b5b5458c686f398", "2a14baea6e9bb51de8cb7e130510312be17f8469" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:16:52 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 14 01:16:53 2016 +0000" }, "message": "Merge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev" }, { "commit": "bce5cc9f9d071e1bd5c6c9194a3c8ee289d2d9a1", "tree": "ff6b4396eafe24f33ef0178b86b80146b35604db", "parents": [ "7e6bd6a911c5eba7b36b9b01804dd4d00132a175" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Jun 27 13:55:14 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 01:08:58 2016 +0000" }, "message": "DO NOT MERGE - SoftMP3: memset safely\n\nBug: 29422022\nChange-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97\n" }, { "commit": "b8676258c1c04cfb2c5a87d00b1b8fe85309b2a9", "tree": "b37c4749c021c3e8e5cae893903c631e357a9124", "parents": [ "b5299033cec510aac9b636cb6b5b5458c686f398" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Jun 24 12:37:45 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 14 00:44:35 2016 +0000" }, "message": "DO NOT MERGE - SoftVPX: fix nFilledLen overflow\n\nBug: 29421675\nChange-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3\n" }, { "commit": "efa1272404186a7c191d120a18b5f4ffcbbccdaf", "tree": "368a9c3988b0bd48d669e52c2908fbf9c5654924", "parents": [ "19ca2d2486746086020e4df31d119e7258ee83db", "357e0f132efdf28cfbe1611ecc03ad332306fa43" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Jul 13 22:41:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 13 22:41:18 2016 +0000" }, "message": "Merge \\\\\"Fix corruption via buffer overflow in mediaserver\\\\\" into klp-dev am: b5299033ce\nam: 357e0f132e\n\nChange-Id: Ia387bc54c8d51975aa4c938616a43e47cb3338d9\n" }, { "commit": "357e0f132efdf28cfbe1611ecc03ad332306fa43", "tree": "ff2e1c68f7d325af8b72d4a568df1fad922a4db0", "parents": [ "cc3c5490652c99e38f0fee37b3ac9d94baa23e80", "b5299033cec510aac9b636cb6b5b5458c686f398" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Jul 13 22:38:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 13 22:38:29 2016 +0000" }, "message": "Merge \\\"Fix corruption via buffer overflow in mediaserver\\\" into klp-dev\nam: b5299033ce\n\nChange-Id: I774cb0256be49317851488879221a1c3602148f3\n" }, { "commit": "b5299033cec510aac9b636cb6b5b5458c686f398", "tree": "ff2e1c68f7d325af8b72d4a568df1fad922a4db0", "parents": [ "b239e274334e9a363235d77f1439284146b18fb1", "b2396a52aa1620a68bba4d776b136b03707f7556" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Jul 13 22:12:57 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 13 22:12:57 2016 +0000" }, "message": "Merge \"Fix corruption via buffer overflow in mediaserver\" into klp-dev" }, { "commit": "19ca2d2486746086020e4df31d119e7258ee83db", "tree": "8276d8739b6938f6e00282ef4ceeb75ed1111ef5", "parents": [ "726010eb1ffee8dfb85ea2871b88eb793baccd0d", "cc3c5490652c99e38f0fee37b3ac9d94baa23e80" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jul 13 03:56:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 13 03:56:57 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\" into klp-dev am: b239e27433\nam: cc3c549065\n\nChange-Id: I772fba4484975a2f28fc947e4a16296b400f5a99\n" }, { "commit": "cc3c5490652c99e38f0fee37b3ac9d94baa23e80", "tree": "d324a0cd445ce4f7dc61251b3e991e5fc75ec871", "parents": [ "34519820bf1ae292a545dbe7fc50cfa5967eeac7", "b239e274334e9a363235d77f1439284146b18fb1" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jul 13 03:45:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 13 03:45:39 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\" into klp-dev\nam: b239e27433\n\nChange-Id: I2f3e5b3b1e4451506e7c66ced8222137d504abdb\n" }, { "commit": "b239e274334e9a363235d77f1439284146b18fb1", "tree": "d324a0cd445ce4f7dc61251b3e991e5fc75ec871", "parents": [ "583a012a9fce81162b163d3533e2644d4abad88a", "7f554618e3091e7c0d6f8eced97d984c33aad08c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jul 13 03:32:16 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 13 03:32:16 2016 +0000" }, "message": "Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into klp-dev" }, { "commit": "2a14baea6e9bb51de8cb7e130510312be17f8469", "tree": "fe346ddc2772920f592dfce4d71df5bcb09ccb41", "parents": [ "583a012a9fce81162b163d3533e2644d4abad88a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Jul 12 18:00:53 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Jul 12 18:00:53 2016 -0700" }, "message": "OMXCodec: check IMemory::pointer() before using allocation\n\nBug: 29421811\nChange-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1\n" }, { "commit": "726010eb1ffee8dfb85ea2871b88eb793baccd0d", "tree": "9ed6f70250568be57232dad1d01c1c8095f61979", "parents": [ "9d65d13cc7c207d4ef877df2834d4fbac74741ad", "34519820bf1ae292a545dbe7fc50cfa5967eeac7" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon Jul 11 21:06:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 11 21:06:45 2016 +0000" }, "message": "Impose a size bound for dynamically allocated tables in stbl. am: 583a012a9f\nam: 34519820bf\n\nChange-Id: Ie338b5b5c726137d173caa97e3a1b428d04d1837\n" }, { "commit": "34519820bf1ae292a545dbe7fc50cfa5967eeac7", "tree": "113f193f233e47e8c9e55445c58235af9a690059", "parents": [ "3ad7688745fc44d01707157ba4edcbad8d41fc3e", "583a012a9fce81162b163d3533e2644d4abad88a" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon Jul 11 21:03:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 11 21:03:59 2016 +0000" }, "message": "Impose a size bound for dynamically allocated tables in stbl.\nam: 583a012a9f\n\nChange-Id: Ide23dfb85980fe89f3b7b536894947981ccd7aaf\n" }, { "commit": "b2396a52aa1620a68bba4d776b136b03707f7556", "tree": "1baf88d75b29a0e32c01f36cbaaa10d8ce48834f", "parents": [ "7e6bd6a911c5eba7b36b9b01804dd4d00132a175" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Jul 06 10:13:25 2016 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Jul 08 15:56:33 2016 -0700" }, "message": "Fix corruption via buffer overflow in mediaserver\n\nchange unbound sprintf() to snprintf() so network-provided values\ncan\u0027t overflow the buffers.\n\nApplicable to all K/L/M/N branches.\n\nBug: 25747670\nChange-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6\n" }, { "commit": "7f554618e3091e7c0d6f8eced97d984c33aad08c", "tree": "b4d2776334014c31c5bc6da00a731f334e746f8d", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Jun 17 01:24:30 2016 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jun 28 15:28:44 2016 +0900" }, "message": "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\n\nAdditionally, remove use of variable length array which is\nnon-standard in C++.\n\nBug: 29161888\nChange-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506\n" }, { "commit": "583a012a9fce81162b163d3533e2644d4abad88a", "tree": "113f193f233e47e8c9e55445c58235af9a690059", "parents": [ "7e6bd6a911c5eba7b36b9b01804dd4d00132a175" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue Jun 21 19:10:21 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Jun 24 11:50:09 2016 -0700" }, "message": "Impose a size bound for dynamically allocated tables in stbl.\n\nImpose a restriction of 200MiB for tables in stsc, stts, ctts and stss\nboxes. Also change mTimeToSample from Vector to array.\n\nBug: 29367429\nChange-Id: I953bea9fe0590268cf27376740f582dc88563d42\n" }, { "commit": "9d65d13cc7c207d4ef877df2834d4fbac74741ad", "tree": "0d22666b8004a8e4ae781514d99b9a00e0059d16", "parents": [ "4c969bf93f71e394de3aa8b08f0ed0f96c48379d", "3ad7688745fc44d01707157ba4edcbad8d41fc3e" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:33:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:33:49 2016 +0000" }, "message": "Merge \\\\\"Revert \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\"\\\\\" into klp-dev am: 7e6bd6a911\nam: 3ad7688745\n\nChange-Id: I02de46ed2ce14428a45826270b557426ee2aaf47\n" }, { "commit": "3ad7688745fc44d01707157ba4edcbad8d41fc3e", "tree": "57ee9ab2cc93c2fbaaaaf8e77999dac195fc770e", "parents": [ "a263248bf02014dfb5d76ac4c07e7dfcdd6518c1", "7e6bd6a911c5eba7b36b9b01804dd4d00132a175" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:31:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:31:13 2016 +0000" }, "message": "Merge \\\"Revert \\\"Impose a size bound for dynamically allocated tables in stbl.\\\"\\\" into klp-dev\nam: 7e6bd6a911\n\nChange-Id: Id0ca80f03ee0426730951f7961ef903c29d3c6ef\n" }, { "commit": "7e6bd6a911c5eba7b36b9b01804dd4d00132a175", "tree": "57ee9ab2cc93c2fbaaaaf8e77999dac195fc770e", "parents": [ "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6", "66c4dbb96c38630d0cd6551fc8c9bf8fa3318903" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:27:32 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 22 18:27:32 2016 +0000" }, "message": "Merge \"Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\" into klp-dev" }, { "commit": "66c4dbb96c38630d0cd6551fc8c9bf8fa3318903", "tree": "ec4f2f5e250208980491f0b0fbc0ee250d3bc15c", "parents": [ "25e029746796fe88e82417fb01af2e27b8bbadb2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:19:15 2016 +0000" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:19:15 2016 +0000" }, "message": "Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\n\nThis reverts commit 25e029746796fe88e82417fb01af2e27b8bbadb2.\n\nChange-Id: I91225838a8be72a3cd413f2bcb99e7dca7e62929\n" }, { "commit": "4c969bf93f71e394de3aa8b08f0ed0f96c48379d", "tree": "637b8ec7d12c6d0fa0341098f22267172baf93d9", "parents": [ "5c1f01675ca0f4f231f206fc7fe64d353592f726", "a263248bf02014dfb5d76ac4c07e7dfcdd6518c1" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 17:55:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 17:55:12 2016 +0000" }, "message": "Merge \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\" into klp-dev am: 8f73edb22a\nam: a263248bf0\n\nChange-Id: I0389073f6b18450edc8fa70ed3ec72683a166915\n" }, { "commit": "a263248bf02014dfb5d76ac4c07e7dfcdd6518c1", "tree": "64727d7547fdef61a404952709b3867f48f681d8", "parents": [ "4bec033dedcb2e9297001878c7837a3d46d205a3", "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jun 22 17:51:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 17:51:55 2016 +0000" }, "message": "Merge \\\"Impose a size bound for dynamically allocated tables in stbl.\\\" into klp-dev\nam: 8f73edb22a\n\nChange-Id: I2dfcb7ee560fdd01f6800a34d50397ac4f71798f\n" }, { "commit": "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6", "tree": "64727d7547fdef61a404952709b3867f48f681d8", "parents": [ "22d65757103e46bef8c6902ea08c84a775b62a0b", "25e029746796fe88e82417fb01af2e27b8bbadb2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 17:38:54 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 22 17:38:54 2016 +0000" }, "message": "Merge \"Impose a size bound for dynamically allocated tables in stbl.\" into klp-dev" }, { "commit": "25e029746796fe88e82417fb01af2e27b8bbadb2", "tree": "b09f9538145fdae6557e38aae36433a8faad7603", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue Jun 21 19:10:21 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jun 22 01:00:26 2016 -0700" }, "message": "Impose a size bound for dynamically allocated tables in stbl.\n\nImpose a restriction of 200MiB for tables in stsc, stts, ctts and stss\nboxes. Also change Vector to std::vector for efficiency and consistency.\n\nBug: 29367429\nChange-Id: I175da524612b9fe68496c612966af51f01a5cd5e\n" }, { "commit": "5c1f01675ca0f4f231f206fc7fe64d353592f726", "tree": "0d22666b8004a8e4ae781514d99b9a00e0059d16", "parents": [ "8b35cb563de25a0b5f743de2eeb385a87e95ca6c", "4bec033dedcb2e9297001878c7837a3d46d205a3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 21 22:03:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 22:03:33 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\" into klp-dev am: 22d6575710\nam: 4bec033ded\n\nChange-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146\n" }, { "commit": "4bec033dedcb2e9297001878c7837a3d46d205a3", "tree": "57ee9ab2cc93c2fbaaaaf8e77999dac195fc770e", "parents": [ "1410b5034f21d27a5754019e8d9fa55b08465277", "22d65757103e46bef8c6902ea08c84a775b62a0b" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 21 22:00:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 22:00:22 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into klp-dev\nam: 22d6575710\n\nChange-Id: I0c2a4ebf1ce1e47a819f2ea2e67ea4bb6f055526\n" }, { "commit": "22d65757103e46bef8c6902ea08c84a775b62a0b", "tree": "57ee9ab2cc93c2fbaaaaf8e77999dac195fc770e", "parents": [ "5713902f6a21fdcb390581e805996cd420cf0218", "7a3de84808f700615816397acc7c7927987bab6e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 21 21:57:34 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 21 21:57:34 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into klp-dev" }, { "commit": "8b35cb563de25a0b5f743de2eeb385a87e95ca6c", "tree": "6b39c785d1c3c8d298d5e26ba834158c3329eb1c", "parents": [ "c971a59f4c2491a2e5143f7118debd7c92fa3333", "1410b5034f21d27a5754019e8d9fa55b08465277" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jun 21 17:38:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 17:38:38 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE omx: check buffer port before using\\\\\" into klp-dev am: 5713902f6a\nam: 1410b5034f\n\nChange-Id: Ib6d17c24784c51a7301094d69a08d13693a1dd16\n" }, { "commit": "c971a59f4c2491a2e5143f7118debd7c92fa3333", "tree": "caf1614ded00369deac9f23323e267f599ba3ab8", "parents": [ "fad42aa98d692c5fd830f7c61b4eb9faf4f7cdca", "075c8f7713c880986b98b81938bf56f2d036c369" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Jun 21 17:38:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 17:38:37 2016 +0000" }, "message": "Check effect command reply size in AudioFlinger am: 110bc9547a\nam: 075c8f7713\n\nChange-Id: I7b70873d12dc258b362c88c8a9ea47ca0e0578ca\n" }, { "commit": "1410b5034f21d27a5754019e8d9fa55b08465277", "tree": "20af9396b4fd637887210dee5da934677fea5310", "parents": [ "075c8f7713c880986b98b81938bf56f2d036c369", "5713902f6a21fdcb390581e805996cd420cf0218" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jun 21 17:35:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 17:35:54 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE omx: check buffer port before using\\\" into klp-dev\nam: 5713902f6a\n\nChange-Id: I8556765a98c6e381548b0b15a90ff08e7281411b\n" }, { "commit": "075c8f7713c880986b98b81938bf56f2d036c369", "tree": "b719fae497302d432d53af62476ca1508f4854cc", "parents": [ "7e6001b97de3a6fa8ed4101dfeb01781807e97bb", "110bc9547a0c851ff1f20f5d7579b34f942947b8" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Jun 21 17:35:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 17:35:54 2016 +0000" }, "message": "Check effect command reply size in AudioFlinger\nam: 110bc9547a\n\nChange-Id: I9649715366450333fab28b4f2f1510edde63fb6a\n" }, { "commit": "5713902f6a21fdcb390581e805996cd420cf0218", "tree": "20af9396b4fd637887210dee5da934677fea5310", "parents": [ "110bc9547a0c851ff1f20f5d7579b34f942947b8", "cb76af124c655e7cd02403c1170df653e3355ef5" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jun 21 17:29:39 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 21 17:29:39 2016 +0000" }, "message": "Merge \"DO NOT MERGE omx: check buffer port before using\" into klp-dev" }, { "commit": "7a3de84808f700615816397acc7c7927987bab6e", "tree": "926c2963967ecb1fb82d5b4584433b30dd3e531d", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 17:00:14 2016 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 21:32:08 2016 -0700" }, "message": "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\n\nSubtract address of a random static object from pointers being routed\nthrough app process.\n\nBug: 28466701\nChange-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04\n" }, { "commit": "cb76af124c655e7cd02403c1170df653e3355ef5", "tree": "bb77d876c9e33ece4877919f8c0a3fc053172e71", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed May 25 16:54:08 2016 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Jun 21 08:09:43 2016 +0900" }, "message": "DO NOT MERGE omx: check buffer port before using\n\nBug: 28816827\nChange-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5\n" }, { "commit": "110bc9547a0c851ff1f20f5d7579b34f942947b8", "tree": "b719fae497302d432d53af62476ca1508f4854cc", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Jun 20 15:22:52 2016 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Jun 20 15:22:52 2016 -0700" }, "message": "Check effect command reply size in AudioFlinger\n\nBug: 29251553\nChange-Id: I1bcc1281f1f0542bb645f6358ce31631f2a8ffbf\n" }, { "commit": "fad42aa98d692c5fd830f7c61b4eb9faf4f7cdca", "tree": "deeed67d440a2acdb6d9ff3a6a0a3bf33ae2ead8", "parents": [ "e66381758d6ba02494251e6097e0774a56524be5", "7e6001b97de3a6fa8ed4101dfeb01781807e97bb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 10 23:16:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 10 23:16:02 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\\" into klp-dev am: dc7357d201\nam: 7e6001b97d\n\nChange-Id: I405712eeccacfe73708b571dd7242ee9eeb96715\n" }, { "commit": "7e6001b97de3a6fa8ed4101dfeb01781807e97bb", "tree": "ec4f2f5e250208980491f0b0fbc0ee250d3bc15c", "parents": [ "0ee3710873997f09b9a0a645e8b2de9923894f17", "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 10 23:12:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 10 23:12:17 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\" into klp-dev\nam: dc7357d201\n\nChange-Id: Ib491eb596eca7011d82bf91338d6d56f1275222c\n" }, { "commit": "dc7357d20175fadfabd903370094917408bf6e3e", "tree": "ec4f2f5e250208980491f0b0fbc0ee250d3bc15c", "parents": [ "598f8d32187ae5892636274b2461bebcc6f31985", "d85c4490b26d9fcefd32757a624cc4f6fdeb7e84" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 10 23:02:40 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 10 23:02:40 2016 +0000" }, "message": "Merge \"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\" into klp-dev" }, { "commit": "e66381758d6ba02494251e6097e0774a56524be5", "tree": "df4f40e2ccb8ca187d1b6a65a597e01ea5615605", "parents": [ "08cb85206ab65cc2b9df372e4ae5f75c331ae7a1", "0ee3710873997f09b9a0a645e8b2de9923894f17" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 23:14:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 08 23:14:09 2016 +0000" }, "message": "Merge \\\\\"Don\\\\\u0027t use sp\u003c\u003e\u0026\\\\\" into klp-dev am: 598f8d3218\nam: 0ee3710873\n\nChange-Id: I95ce93c3c1975b444bd6cd2c49a3b215395d2754\n" }, { "commit": "08cb85206ab65cc2b9df372e4ae5f75c331ae7a1", "tree": "517c93a25e6a04eaff18ecc69d67c3c0ebb879b1", "parents": [ "3d1df4f411a531fb30cc8563cb39e732041d22ad", "f5d9360be05d552277364c4a2be04db78726e5f0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 23:14:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 08 23:14:08 2016 +0000" }, "message": "Fix potential overflow am: d0090759e7\nam: f5d9360be0\n\nChange-Id: Ia936e59f80f6a24e449d0aee453956e3be29033a\n" }, { "commit": "0ee3710873997f09b9a0a645e8b2de9923894f17", "tree": "99b15e64e6fb7d159a1722aa00add4c2c75a6d12", "parents": [ "f5d9360be05d552277364c4a2be04db78726e5f0", "598f8d32187ae5892636274b2461bebcc6f31985" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 23:11:32 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 08 23:11:32 2016 +0000" }, "message": "Merge \\\"Don\\\u0027t use sp\u003c\u003e\u0026\\\" into klp-dev\nam: 598f8d3218\n\nChange-Id: I25294fc199e7242dbb2a9700303e713734bbb37d\n" }, { "commit": "f5d9360be05d552277364c4a2be04db78726e5f0", "tree": "5f3a6924c8aed0ba09ebfd59bb3f5f5a9a8b05fe", "parents": [ "e2ca7517232e2df2dc16d358809d7e4723827c42", "d0090759e79208d7203280166018bb7d5d4f9d02" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 23:11:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 08 23:11:31 2016 +0000" }, "message": "Fix potential overflow\nam: d0090759e7\n\nChange-Id: I261e67806c6e0e6b39cdce99883574024a266c13\n" }, { "commit": "598f8d32187ae5892636274b2461bebcc6f31985", "tree": "99b15e64e6fb7d159a1722aa00add4c2c75a6d12", "parents": [ "d0090759e79208d7203280166018bb7d5d4f9d02", "fc47a301b7b2b044eddaedc98861d55193ec7dc0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 22:56:35 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 08 22:56:35 2016 +0000" }, "message": "Merge \"Don\u0027t use sp\u003c\u003e\u0026\" into klp-dev" }, { "commit": "d85c4490b26d9fcefd32757a624cc4f6fdeb7e84", "tree": "5e750bd6d5fde2d1242e35b76b8c3ec34e3b119c", "parents": [ "b016207fc2442420e8d3a8633575ffe4fc29fef3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 15:00:08 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 15:00:08 2016 -0700" }, "message": "DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\n\nBug: 29153599\nChange-Id: Ieb70a90cf31927165de7a840bfdd3ee2c76f4cbd\n" }, { "commit": "d0090759e79208d7203280166018bb7d5d4f9d02", "tree": "5f3a6924c8aed0ba09ebfd59bb3f5f5a9a8b05fe", "parents": [ "b016207fc2442420e8d3a8633575ffe4fc29fef3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 15:48:07 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 16:25:07 2016 -0700" }, "message": "Fix potential overflow\n\nBug: 28533562\nChange-Id: I798ab24caa4c81f3ba564cad7c9ee019284fb702\n" }, { "commit": "fc47a301b7b2b044eddaedc98861d55193ec7dc0", "tree": "8f64350afe90fc797bba02c7a24720a9c80c31f5", "parents": [ "b016207fc2442420e8d3a8633575ffe4fc29fef3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:31:11 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "3d1df4f411a531fb30cc8563cb39e732041d22ad", "tree": "3374fbbea0cf570d501653c2e23a809f4c6cb5bc", "parents": [ "e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996", "e2ca7517232e2df2dc16d358809d7e4723827c42" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed May 25 18:37:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 25 18:37:08 2016 +0000" }, "message": "DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2\nam: e2ca751723\n\n* commit \u0027e2ca7517232e2df2dc16d358809d7e4723827c42\u0027:\n DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nChange-Id: Ia1dd264fc19f8c82a59a5e2656375f2c2c4403ff\n" }, { "commit": "e2ca7517232e2df2dc16d358809d7e4723827c42", "tree": "42d8458efc7f4c44177181fc2a4c266c8a0d06d7", "parents": [ "38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a", "b016207fc2442420e8d3a8633575ffe4fc29fef3" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed May 25 18:29:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 25 18:29:43 2016 +0000" }, "message": "DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\nam: b016207fc2\n\n* commit \u0027b016207fc2442420e8d3a8633575ffe4fc29fef3\u0027:\n DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nChange-Id: I81cdae1a917cfcd712e800cf3edfd168b1c89c32\n" }, { "commit": "b016207fc2442420e8d3a8633575ffe4fc29fef3", "tree": "42d8458efc7f4c44177181fc2a4c266c8a0d06d7", "parents": [ "f8429c0c147b081ff6f06f55f8fa2f36fc60063e" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Aug 28 10:35:35 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed May 25 03:47:11 2016 +0000" }, "message": "DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nGenericSource: return error when no track exists.\n\nSampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.\n\nBug: 21657957\nBug: 23705695\nBug: 22802344\nBug: 28799341\nChange-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04\n(cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)\n" }, { "commit": "e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996", "tree": "4d3e9bef2258720fb70694a3d6922e820fd220aa", "parents": [ "8fd8bfdfbd930cdc669c4fc33d7d251f12ec7e5e", "38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 22:50:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 23 22:50:37 2016 +0000" }, "message": "Merge \"DO NOT MERGE limit mediaserver memory\" into klp-dev am: f8429c0c14\nam: 38ab87c3e3\n\n* commit \u002738ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a\u0027:\n DO NOT MERGE limit mediaserver memory\n\nChange-Id: I053031830618e20ff830ae3c097abba10ae73cfc\n" }, { "commit": "38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a", "tree": "f22a6040b40efbbb398dcc2bfc6a5e126787e0a0", "parents": [ "9897bd43a614c28e6c52dcbce817d9ef6f201ccc", "f8429c0c147b081ff6f06f55f8fa2f36fc60063e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 22:46:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 23 22:46:23 2016 +0000" }, "message": "Merge \"DO NOT MERGE limit mediaserver memory\" into klp-dev\nam: f8429c0c14\n\n* commit \u0027f8429c0c147b081ff6f06f55f8fa2f36fc60063e\u0027:\n DO NOT MERGE limit mediaserver memory\n\nChange-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b\n" }, { "commit": "f8429c0c147b081ff6f06f55f8fa2f36fc60063e", "tree": "f22a6040b40efbbb398dcc2bfc6a5e126787e0a0", "parents": [ "fddbb1a791975adfa1323377b09606ad44122ff2", "1438f0b215040eb92e2b1e799f757ad32d5f8f22" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 22:35:11 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 22:35:12 2016 +0000" }, "message": "Merge \"DO NOT MERGE limit mediaserver memory\" into klp-dev" }, { "commit": "1438f0b215040eb92e2b1e799f757ad32d5f8f22", "tree": "a2d5cae4a33c3c4c4a2e09aea70c412a6d0e8c6c", "parents": [ "71095f174e8b88e008623b4cacd4ec0581b9015c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri May 13 10:43:19 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 08:54:13 2016 -0700" }, "message": "DO NOT MERGE limit mediaserver memory\n\nLimit mediaserver using rlimit, to prevent it from bringing down the system\nvia the low memory killer.\nDefault max is 65% of total RAM, but can be customized via system property.\n\nBug: 28471206\nBug: 28615448\nChange-Id: I14fac1e12b5f3983be08a21bfbfc54feedbf3f16\n" }, { "commit": "8fd8bfdfbd930cdc669c4fc33d7d251f12ec7e5e", "tree": "ce247737dff6dd5295ee27c268c7a06ea181b233", "parents": [ "31a3aa56287d63aaf1ac804cc04154ed779032ff", "9897bd43a614c28e6c52dcbce817d9ef6f201ccc" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 14:40:27 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 23 14:40:27 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check malloc result to avoid NPD\" into klp-dev am: fddbb1a791\nam: 9897bd43a6\n\n* commit \u00279897bd43a614c28e6c52dcbce817d9ef6f201ccc\u0027:\n DO NOT MERGE Check malloc result to avoid NPD\n\nChange-Id: Ia9f97994af54fff11644f7d59821e8ddf6fb54f1\n" }, { "commit": "9897bd43a614c28e6c52dcbce817d9ef6f201ccc", "tree": "d8a3f3f8612c477c1a61b90fc4d6493dc5985f52", "parents": [ "883b244f4567fe0cd099f0583940e531eb0e2af4", "fddbb1a791975adfa1323377b09606ad44122ff2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 14:37:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 23 14:37:29 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check malloc result to avoid NPD\" into klp-dev\nam: fddbb1a791\n\n* commit \u0027fddbb1a791975adfa1323377b09606ad44122ff2\u0027:\n DO NOT MERGE Check malloc result to avoid NPD\n\nChange-Id: Idf65c8e5520e1c2a4571ea434f0114ae13334e7b\n" }, { "commit": "fddbb1a791975adfa1323377b09606ad44122ff2", "tree": "d8a3f3f8612c477c1a61b90fc4d6493dc5985f52", "parents": [ "eb37c37c594604d0e6acbf14be6e04e065fab226", "ad92798cc37677ed14cacf1caf62196612a6b71e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 23 14:32:45 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 14:32:46 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check malloc result to avoid NPD\" into klp-dev" }, { "commit": "31a3aa56287d63aaf1ac804cc04154ed779032ff", "tree": "26a42f2f1b55e0feb6368f463bcf34f2206d390b", "parents": [ "5dfa5f268e97d862744ffddc4596577495022bea", "883b244f4567fe0cd099f0583940e531eb0e2af4" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 13 21:17:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 21:17:31 2016 +0000" }, "message": "Merge \"Fix security vulnerability in libstagefright\" into klp-dev am: eb37c37c59\nam: 883b244f45\n\n* commit \u0027883b244f4567fe0cd099f0583940e531eb0e2af4\u0027:\n Fix security vulnerability in libstagefright\n\nChange-Id: Idd0798f74590e2546c4f0d1b0940ccf7e42f5a17\n" }, { "commit": "883b244f4567fe0cd099f0583940e531eb0e2af4", "tree": "c94db64fc66647c3907aaba13290bf2fecf728e0", "parents": [ "2a68d5279d714188c50a32819ae0d0ed2535a763", "eb37c37c594604d0e6acbf14be6e04e065fab226" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 13 21:14:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 21:14:44 2016 +0000" }, "message": "Merge \"Fix security vulnerability in libstagefright\" into klp-dev\nam: eb37c37c59\n\n* commit \u0027eb37c37c594604d0e6acbf14be6e04e065fab226\u0027:\n Fix security vulnerability in libstagefright\n\nChange-Id: Icaecc46c13c06e6eff0167bbc1af4c580d161f62\n" }, { "commit": "eb37c37c594604d0e6acbf14be6e04e065fab226", "tree": "c94db64fc66647c3907aaba13290bf2fecf728e0", "parents": [ "87277aac64a21461b657298dcdcb809737347980", "d7d50415082db3191dd108bd94a898763263055b" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 13 21:08:15 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 13 21:08:15 2016 +0000" }, "message": "Merge \"Fix security vulnerability in libstagefright\" into klp-dev" }, { "commit": "ad92798cc37677ed14cacf1caf62196612a6b71e", "tree": "2d73f8b239cd5f1f17be88a8586611f8a3de49d4", "parents": [ "71095f174e8b88e008623b4cacd4ec0581b9015c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 11 11:11:20 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri May 13 13:13:49 2016 -0700" }, "message": "DO NOT MERGE Check malloc result to avoid NPD\n\nBug: 28471206\nChange-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345\n" }, { "commit": "5dfa5f268e97d862744ffddc4596577495022bea", "tree": "bcf1a5effec9220c396e99e55b09f6b49c0bdb2f", "parents": [ "2d4cf313fa141d11cfae7c31797da114598d8ed7", "2a68d5279d714188c50a32819ae0d0ed2535a763" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri May 13 19:46:20 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 19:46:20 2016 +0000" }, "message": "h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64\nam: 2a68d5279d\n\n* commit \u00272a68d5279d714188c50a32819ae0d0ed2535a763\u0027:\n h264bsdActivateParamSets: Prevent multiplication overflow.\n\nChange-Id: I00c30eb03aab08cb86afa34ab3e7a86a176b4dda\n" }, { "commit": "2a68d5279d714188c50a32819ae0d0ed2535a763", "tree": "43b7ad4413ea281e849cc8d2ba71e47340e51473", "parents": [ "4b817b51e2998719037f362c7b70ee71c76abeb8", "87277aac64a21461b657298dcdcb809737347980" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri May 13 19:43:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 19:43:42 2016 +0000" }, "message": "h264bsdActivateParamSets: Prevent multiplication overflow.\nam: 87277aac64\n\n* commit \u002787277aac64a21461b657298dcdcb809737347980\u0027:\n h264bsdActivateParamSets: Prevent multiplication overflow.\n\nChange-Id: I87166daa0493721d44a10531466b59080b65f153\n" }, { "commit": "d7d50415082db3191dd108bd94a898763263055b", "tree": "d201c855b15c4f8d7cb637f47325308767b8ed9f", "parents": [ "3d6a7149802928ecf3f58b7218b0e82699b492df" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 13 11:48:11 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 13 12:40:35 2016 -0700" }, "message": "Fix security vulnerability in libstagefright\n\nbug: 28175045\nChange-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f\n" }, { "commit": "87277aac64a21461b657298dcdcb809737347980", "tree": "43b7ad4413ea281e849cc8d2ba71e47340e51473", "parents": [ "71095f174e8b88e008623b4cacd4ec0581b9015c" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 11 16:08:21 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 11 20:23:21 2016 -0700" }, "message": "h264bsdActivateParamSets: Prevent multiplication overflow.\n\nReport MEMORY_ALLOCATION_ERROR if pStorage-\u003epicSizeInMbs would\nexceed UINT32_MAX bytes.\n\nBug: 28532266\nChange-Id: Ia6f11efb18818afcdb5fa2a38a14f2a2d8c8447a\n" }, { "commit": "2d4cf313fa141d11cfae7c31797da114598d8ed7", "tree": "071a098d94514f57ca52af53c010d964d02a7bfe", "parents": [ "f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6", "4b817b51e2998719037f362c7b70ee71c76abeb8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:23:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:23:01 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e\nam: 4b817b51e2\n\n* commit \u00274b817b51e2998719037f362c7b70ee71c76abeb8\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I6d09ecb88cf32f2c720dd0ec66964ec94ad210da\n" }, { "commit": "4b817b51e2998719037f362c7b70ee71c76abeb8", "tree": "8bf4ba16286ea7922cf653f1c1240bdb8bea1793", "parents": [ "e25ff0130ef9fa184afb87e92c184172c8a96f71", "71095f174e8b88e008623b4cacd4ec0581b9015c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:20:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:20:38 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev\nam: 71095f174e\n\n* commit \u002771095f174e8b88e008623b4cacd4ec0581b9015c\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I5d6dee2901dca6c63ed41abf5d1165ac85a69d7e\n" }, { "commit": "71095f174e8b88e008623b4cacd4ec0581b9015c", "tree": "8bf4ba16286ea7922cf653f1c1240bdb8bea1793", "parents": [ "c002126cb05b1d640c0a0b51bc0de810a62ab2b1", "e663be8d475ec6035a1a4257b208549b4375fa08" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:15:43 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 03 23:15:43 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev" }, { "commit": "e663be8d475ec6035a1a4257b208549b4375fa08", "tree": "1c4a94e725ba62ed4d42f9e42cde94ab4bc08868", "parents": [ "a3dd713893658baf50df88b261aba83bb0c40687" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 02 14:12:34 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 02 14:12:34 2016 -0700" }, "message": "Clear unused pointer field when sending across binder\n\nBug: 28377502\nChange-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98\n" }, { "commit": "f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6", "tree": "ed0c07ea2690ce9ca709c05277ecf730a02251c5", "parents": [ "63e9b573530837702e42e00900407bbe9fdae952", "e25ff0130ef9fa184afb87e92c184172c8a96f71" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:15:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:15:07 2016 +0000" }, "message": "Merge \"DO NOT MERGE More OMX struct checking\" into klp-dev am: c002126cb0\nam: e25ff0130e\n\n* commit \u0027e25ff0130ef9fa184afb87e92c184172c8a96f71\u0027:\n DO NOT MERGE More OMX struct checking\n\nChange-Id: Ia9767e906a247c330031837c3b0b6415e319c836\n" }, { "commit": "e25ff0130ef9fa184afb87e92c184172c8a96f71", "tree": "619a3f31678c250a0d2a24999a9c382e297d1f51", "parents": [ "a1e309beb98e8fb35422102717af4f973ef1f34b", "c002126cb05b1d640c0a0b51bc0de810a62ab2b1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:12:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:12:58 2016 +0000" }, "message": "Merge \"DO NOT MERGE More OMX struct checking\" into klp-dev\nam: c002126cb0\n\n* commit \u0027c002126cb05b1d640c0a0b51bc0de810a62ab2b1\u0027:\n DO NOT MERGE More OMX struct checking\n\nChange-Id: I206ad72ac3ed1da96b417dd9cbe170e0a0dd1d66\n" }, { "commit": "c002126cb05b1d640c0a0b51bc0de810a62ab2b1", "tree": "619a3f31678c250a0d2a24999a9c382e297d1f51", "parents": [ "70dec4dc7d1d813afaff58fb26b0fd7127e897bf", "1fdf00971ba4419f102e5e2c29975ae238eaaa3c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 17:45:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 17:45:56 2016 +0000" }, "message": "Merge \"DO NOT MERGE More OMX struct checking\" into klp-dev" }, { "commit": "1fdf00971ba4419f102e5e2c29975ae238eaaa3c", "tree": "4829dee6c08f32c3688c3080b34b25f63397c3f4", "parents": [ "a3dd713893658baf50df88b261aba83bb0c40687" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:54:04 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:56:36 2016 -0700" }, "message": "DO NOT MERGE More OMX struct checking\n\nThese were lost due to bad merges.\n\nBug: 27207275\nChange-Id: Ia0f403d7aef79a8e0ac618eb49b34dbf9faa25c2\n" }, { "commit": "63e9b573530837702e42e00900407bbe9fdae952", "tree": "c28f643ca958df09c553277ea49e0fe4de3b5886", "parents": [ "9345299e27e68b524c4b606d178802a4e7289aa1", "a1e309beb98e8fb35422102717af4f973ef1f34b" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 18:57:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 18:57:16 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d\nam: a1e309beb9\n\n* commit \u0027a1e309beb98e8fb35422102717af4f973ef1f34b\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: I1dd3ffd9a489453d0f66c0344f52c6efecf31b2e\n" }, { "commit": "a1e309beb98e8fb35422102717af4f973ef1f34b", "tree": "03cc0e0abc2fb719834d94e6b5b66134d2b8a1f6", "parents": [ "f249b0fe1d2602d07da8bfeb64bc64518a0ec46a", "70dec4dc7d1d813afaff58fb26b0fd7127e897bf" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 18:55:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 18:55:02 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\nam: 70dec4dc7d\n\n* commit \u002770dec4dc7d1d813afaff58fb26b0fd7127e897bf\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: Ie3a265ed0dc34c544b0793dce06434ec64f9bacf\n" }, { "commit": "70dec4dc7d1d813afaff58fb26b0fd7127e897bf", "tree": "03cc0e0abc2fb719834d94e6b5b66134d2b8a1f6", "parents": [ "7cab953629b615cfe5fec8f56266996bc17307b5" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Apr 20 15:51:48 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Apr 20 16:01:17 2016 -0700" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug\n28076789.\n\nDetail: Before the original fix\n(Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for 28076789, the\ncode allowed a time-to-sample table size to be 0. The change\nmade in that fix disallowed such situation, which in fact should\nbe allowed. This current patch allows it again while maintaining\nthe security of the previous fix.\n\nBug: 28288202\nBug: 28076789\nChange-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295\n" }, { "commit": "9345299e27e68b524c4b606d178802a4e7289aa1", "tree": "94aedb7f58d20e586cc53c30878bed13dc9d0714", "parents": [ "a0970c9faabdaca647cb22b78432511de3220399", "f249b0fe1d2602d07da8bfeb64bc64518a0ec46a" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Apr 18 04:56:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 18 04:56:57 2016 +0000" }, "message": "Merge \"DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec\" into klp-dev am: 7cab953\nam: f249b0f\n\n* commit \u0027f249b0fe1d2602d07da8bfeb64bc64518a0ec46a\u0027:\n DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec\n\nChange-Id: I87ec36dcfaccae4fa8d7cb247651704c7ef0e4d3\n" }, { "commit": "f249b0fe1d2602d07da8bfeb64bc64518a0ec46a", "tree": "1163b468e11e27bbf57b54a63042a771bc3b5a26", "parents": [ "e896c41d85a15de06c74885fe040f3f57b63cd5d", "7cab953629b615cfe5fec8f56266996bc17307b5" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Apr 18 04:52:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 18 04:52:07 2016 +0000" }, "message": "Merge \"DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec\" into klp-dev\nam: 7cab953\n\n* commit \u00277cab953629b615cfe5fec8f56266996bc17307b5\u0027:\n DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec\n\nChange-Id: Icbd07fb9f62bb4f1381f6573188d32c8f126dc90\n" }, { "commit": "7cab953629b615cfe5fec8f56266996bc17307b5", "tree": "1163b468e11e27bbf57b54a63042a771bc3b5a26", "parents": [ "59645279f48b3ae83ab42445148ea236c5dc72c4", "0490fe25b580546f54d4d5bdb184fa8df091dfc5" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Apr 18 04:39:54 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 18 04:39:54 2016 +0000" }, "message": "Merge \"DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec\" into klp-dev" }, { "commit": "a0970c9faabdaca647cb22b78432511de3220399", "tree": "f1f32337b6812a38e1fda5417b3489e9b84de193", "parents": [ "9f3762d8c76b778c8f600486a464838731105b09", "e896c41d85a15de06c74885fe040f3f57b63cd5d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:09:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:09:00 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527\nam: e896c41\n\n* commit \u0027e896c41d85a15de06c74885fe040f3f57b63cd5d\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7\n" }, { "commit": "e896c41d85a15de06c74885fe040f3f57b63cd5d", "tree": "301c789f7d1090835789ed9cf2f330ea78f49c4d", "parents": [ "d504c68310bf86e24321a7260c2ecdd9962c8b3b", "59645279f48b3ae83ab42445148ea236c5dc72c4" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:06:36 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:06:36 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev\nam: 5964527\n\n* commit \u002759645279f48b3ae83ab42445148ea236c5dc72c4\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I37ea7cd16f1e0fcf2ce14d6687de080a7c0931c1\n" }, { "commit": "59645279f48b3ae83ab42445148ea236c5dc72c4", "tree": "301c789f7d1090835789ed9cf2f330ea78f49c4d", "parents": [ "a3dd713893658baf50df88b261aba83bb0c40687", "a3630a418b4f65277a42cd4018cd3b0b7e134d0c" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:01:22 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 16 00:01:22 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev" } ], "next": "a3630a418b4f65277a42cd4018cd3b0b7e134d0c" }