72864 2011-11-21 00:23:23 -0800 ImageDecoder setSize() should check for backing store allocation failure 2011-12-05 03:01:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72245 73812 1 noel.gordon noel.gordon abarth kling mihaip mrobinson pkasting webkit.review.bot zimmermann oldest_to_newest 506759 0 noel.gordon 2011-11-21 00:23:23 -0800 ImageDecoder setSize() should check for backing store allocation failure. 506767 1 116045 noel.gordon 2011-11-21 00:29:12 -0800 Created attachment 116045 Patch 506869 2 116066 noel.gordon 2011-11-21 04:25:09 -0800 Created attachment 116066 Patch 506887 3 noel.gordon 2011-11-21 04:51:38 -0800 Not sure we have a super-sized image test. Adding Mihai due to bug 48634, and folks from other ports. 506974 4 116066 kling 2011-11-21 08:09:25 -0800 Comment on attachment 116066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116066&action=review Good idea! > Source/WebCore/ChangeLog:20 > + No new tests. Covered by existing tests. Is it really? If not, it should be pretty easy to construct a gigantic image that still has a small file size. > Source/WebCore/platform/image-decoders/ImageDecoder.cpp:193 > + size_t backingStoreSize = newWidth * newHeight; This could overflow on 32-bit platforms. > Source/WebCore/platform/image-decoders/ImageDecoder.cpp:194 > + if (!m_backingStore.tryReserveCapacity(backingStoreSize)) tryReserveCapacity() will not update Vector::m_size. You need to resize() it after tryReserveCapacity() succeeds. 506977 5 mihaip 2011-11-21 08:12:19 -0800 fast/images/size-failure.html should be testing a large image. 506980 6 kling 2011-11-21 08:16:47 -0800 (In reply to comment #4) > (From update of attachment 116066 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116066&action=review > > > Source/WebCore/platform/image-decoders/ImageDecoder.cpp:193 > > + size_t backingStoreSize = newWidth * newHeight; > > This could overflow on 32-bit platforms. D'oh, I completely missed the comment in the ChangeLog about overflow being covered. (In reply to comment #5) > fast/images/size-failure.html should be testing a large image. Great, thanks! 507368 7 noel.gordon 2011-11-21 19:12:45 -0800 (In reply to comment #5) > fast/images/size-failure.html should be testing a large image. Added you for a reason :) will refer to that test to the ChangeLog. % find . -name Skipped | xargs grep size-failure ./gtk/Skipped:fast/images/size-failure.html ./mac-snowleopard/Skipped:fast/images/size-failure.html gtk covered by bug 72245, mac-snowleopard by a radar bug. 507371 8 noel.gordon 2011-11-21 19:16:19 -0800 (In reply to comment #6) > (In reply to comment #4) > > (From update of attachment 116066 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=116066&action=review > > > > > Source/WebCore/platform/image-decoders/ImageDecoder.cpp:193 > > > + size_t backingStoreSize = newWidth * newHeight; > > > > This could overflow on 32-bit platforms. > > D'oh, I completely missed the comment in the ChangeLog about overflow being covered. No worries, bug 48634 was instructive and I thought it worth mentioning. 507383 9 noel.gordon 2011-11-21 19:47:56 -0800 (In reply to comment #4) > (From update of attachment 116066 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116066&action=review > > > Source/WebCore/platform/image-decoders/ImageDecoder.cpp:194 > > + if (!m_backingStore.tryReserveCapacity(backingStoreSize)) > > tryReserveCapacity() will not update Vector::m_size. You need to resize() it after tryReserveCapacity() succeeds. Indeed you are correct. However, the image decoders don't use/require a Vector:m_size. They instead access the underlying Vector buffer() via the m_btyes member ... if (!m_backingStore.tryReserveCapacity(backingStoreSize)) return false; m_bytes = m_backingStore.data(); ... when writing decoded image pixel data into the buffer (m_backingStore). Still I don't mind adding the resize() if necessary. Your point did make me stare at the ASSERT(m_backingStore.isEmpty()) some more - it's wrong - changed it to ASSERT(!m_bytes). 507385 10 116172 noel.gordon 2011-11-21 19:51:19 -0800 Created attachment 116172 Patch 510162 11 noel.gordon 2011-11-28 14:13:14 -0800 Anything more I need to do here? 510183 12 abarth 2011-11-28 14:34:48 -0800 I mean, you could add a comment about not calling resize. I think the difference is that you're not going to call the constructor on all the elements of the vector. 510312 13 116172 webkit.review.bot 2011-11-28 16:23:15 -0800 Comment on attachment 116172 Patch Clearing flags on attachment: 116172 Committed r101302: <http://trac.webkit.org/changeset/101302> 510313 14 webkit.review.bot 2011-11-28 16:23:21 -0800 All reviewed patches have been landed. Closing bug. 510585 15 zimmermann 2011-11-29 01:18:01 -0800 The m_bytes assertion fires on lots of bots - rolling this out for now... 510916 16 pkasting 2011-11-29 11:01:45 -0800 Reopened since the patch was rolled out. 511173 17 noel.gordon 2011-11-29 16:01:46 -0800 (In reply to comment #15) > The m_bytes assertion fires on lots of bots - rolling this out for now... ImageFrame::ImageFrame() does not initialize m_size at construction time, seems easy to fix. Other ports ASSERT the setSize() contract - that it only be called once - using ASSERT(width() == 0 && height() == 0), so I'll use that. Add comment Adam asked for about not needing to resize the Vector backing store. Preparing a patch ... 511186 18 noel.gordon 2011-11-29 16:16:32 -0800 ASSERT(width() == 0 && height() == 0) fails to pass webkit check style, so I'll use nots instead. 511190 19 117068 noel.gordon 2011-11-29 16:19:48 -0800 Created attachment 117068 Patch 512128 20 noel.gordon 2011-11-30 14:20:09 -0800 (In reply to comment #18) > ASSERT(width() == 0 && height() == 0) fails to pass webkit check style, so I'll > use nots instead. Filed bug 73490 to remove these style nits elsewhere. Here we're just waiting on the gtk ews to return and catch-up. 513127 21 noel.gordon 2011-12-01 14:36:37 -0800 Question reviewers: is setting m_data to 0 correct? ImageFrame::operator() = is overloaded. It calls ImageFrame::copyBitmapData(const ImageFrame& other), which sets ... m_backingStore = other.m_backingStore; m_bytes = m_backingStore.data(); I would have expected "m_data = other.m_data" here, what am I missing? 513154 22 noel.gordon 2011-12-01 14:53:17 -0800 Specifically, should we write it like this ... m_backingStore = other.m_backingStore; m_bytes = other.m_data; if (m_bytes) m_bytes = m_backingStore.data(); 514818 23 noel.gordon 2011-12-04 18:31:58 -0800 /shrug/, maybe not touch m_data at all. 514819 24 117821 noel.gordon 2011-12-04 18:32:22 -0800 Created attachment 117821 Patch for landing 514938 25 117821 webkit.review.bot 2011-12-04 23:58:35 -0800 Comment on attachment 117821 Patch for landing Clearing flags on attachment: 117821 Committed r101975: <http://trac.webkit.org/changeset/101975> 514939 26 webkit.review.bot 2011-12-04 23:58:41 -0800 All reviewed patches have been landed. Closing bug. 514996 27 noel.gordon 2011-12-05 03:00:59 -0800 Following GIF tests were unhappy on GTK Release bots. Filed bug 73812. fast/images/dont-crash-with-null-gif-frames.html = CRASH fast/backgrounds/animated-gif-as-background.html = CRASH fast/images/gif-loop-count.html = CRASH 116045 2011-11-21 00:29:12 -0800 2011-11-21 04:25:01 -0800 Patch bug-72864-20111121192641.patch text/plain 2311 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwODg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDU0YTE3YzQ4OTQ2M2Y2 ZjVjMmQxODIwYWE1Njg3NmEwMDdkOWVhOS4uZTQ3OGU0NDYxNjUyZmY4ODA4ZDM1ZmI5NWVjZjFl NGJiNzJlNGU4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTIwICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBJbWFnZURlY29kZXIg c2V0U2l6ZSgpIHNob3VsZCBjaGVjayBmb3IgYmFja2luZyBzdG9yZSBhbGxvY2F0aW9uIGZhaWx1 cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODY0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGRl Y29kZWQgaW1hZ2UgYmFja2luZyBzdG9yZSBpcyBhIFZlY3RvcjxQaXhlbERhdGE+IG9uIHRoZSBh ZmZlY3RlZCBwb3J0cy4gVmVjdG9yPD4KKyAgICAgICAgaGFzIGEgcmVzaXplIGNhcGFjaXR5IG1l bWJlciB0aGF0IHJldHVybnMgdHJ1ZSBpZiB0aGUgcmVzaXplIGFsbG9jYXRpb24gc3VjY2VlZHMu CisKKyAgICAgICAgVGhlIGltYWdlIHdpZHRoIGFuZCBoZWlnaHQgaGF2ZSBiZWVuIGNoZWNrZWQg YnkgSW1hZ2VEZWNvZGVyOjppc092ZXJTaXplKHdpZHRoLCBoZWlnaHQpCisgICAgICAgIHByaW9y IHRvIGNhbGxpbmcgc2V0U2l6ZSgpLCBzZWUgaHR0cDovL3dlYmtpdC5vcmcvYi80ODYzNCBmb3Ig ZGljdXNzaW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBleGlzdGluZyB0 ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lOjpzZXRTaXplKTogUmVzaXplIHRoZSBi YWNraW5nIHN0b3JlIGNhcGFjaXR5IHRvIHRoZSByZXF1ZXN0ZWQKKyAgICAgICAgc2l6ZSBhbmQg cmV0dXJuIGZhbHNlIG9uIGZhaWx1cmUuIHNldFNpemUoKSBzaG91bGQgYmUgY2FsbGVkIG9uY2Ut b25seSBkdXJpbmcgYW4gaW1hZ2UKKyAgICAgICAgZGVjb2RlLiBBZGQgYW4gZXhwbGljaXQgQVNT RVJUIGZvciB0aGF0LgorCiAyMDExLTExLTIwICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFJlbW92ZSBvbGQgZ2V0Rm9udEZhbWls eUZvckNoYXJhY3RlcnMoKSBhbmQgZmFtaWx5Rm9yQ2hhcnMoKSBBUElzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAK aW5kZXggY2E2MzY5ZWI0Y2U5ZmVmZmNlYTEzYzUzMDQ5ZDRlZTFmY2EyNTA5OS4uMTEwZDk3YmU2 MmRmZGExMGQ0YjE2YTIyZjY4ZTdiNjRmZjNkNzUyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCkBAIC0xODks MTQgKzE4OSwxNCBAQCBib29sIEltYWdlRnJhbWU6OmNvcHlCaXRtYXBEYXRhKGNvbnN0IEltYWdl RnJhbWUmIG90aGVyKQogCiBib29sIEltYWdlRnJhbWU6OnNldFNpemUoaW50IG5ld1dpZHRoLCBp bnQgbmV3SGVpZ2h0KQogewotICAgIC8vIE5PVEU6IFRoaXMgaGFzIG5vIHdheSB0byBjaGVjayBm b3IgYWxsb2NhdGlvbiBmYWlsdXJlIGlmIHRoZSByZXF1ZXN0ZWQKLSAgICAvLyBzaXplIHdhcyB0 b28gYmlnLi4uCi0gICAgbV9iYWNraW5nU3RvcmUucmVzaXplKG5ld1dpZHRoICogbmV3SGVpZ2h0 KTsKKyAgICBBU1NFUlQobV9iYWNraW5nU3RvcmUuaXNFbXB0eSgpKTsKKyAgICBzaXplX3QgYmFj a2luZ1N0b3JlU2l6ZSA9IG5ld1dpZHRoICogbmV3SGVpZ2h0OworICAgIGlmICghbV9iYWNraW5n U3RvcmUudHJ5UmVzZXJ2ZUNhcGFjaXR5KGJhY2tpbmdTdG9yZVNpemUpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgbV9ieXRlcyA9IG1fYmFja2luZ1N0b3JlLmRhdGEoKTsKICAgICBtX3Np emUgPSBJbnRTaXplKG5ld1dpZHRoLCBuZXdIZWlnaHQpOwogCiAgICAgemVyb0ZpbGxQaXhlbERh dGEoKTsKLQogICAgIHJldHVybiB0cnVlOwogfQogCg== 116066 2011-11-21 04:25:09 -0800 2011-11-21 19:51:10 -0800 Patch bug-72864-20111121232507.patch text/plain 2369 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjFiZWMyMzFlMWNmZDlj ZDkwNTViZjQzNGYwZTZmNGQ5YmM0ZmM3Ny4uNDI3ZjEzZjYyNDgyOTFmMmFmMTEzMzUyZDczN2I2 YmFkNzdiY2RhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTIxICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBJbWFnZURlY29kZXIg c2V0U2l6ZSgpIHNob3VsZCBjaGVjayBmb3IgYmFja2luZyBzdG9yZSBhbGxvY2F0aW9uIGZhaWx1 cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODY0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJh Y2tpbmcgc3RvcmUgb2YgYSBkZWNvZGVkIGltYWdlIGlzIGEgVmVjdG9yPFBpeGVsRGF0YT4gb24g dGhlIGFmZmVjdGVkCisgICAgICAgIHBvcnRzLiBBbmQgVmVjdG9yPD4gcHJvdmlkZXMgYSByZXNp emUgY2FwYWNpdHkgbWVtYmVyIHRoYXQgcmV0dXJucyBmYWxzZSBpZgorICAgICAgICBtZW1vcnkg YWxsb2NhdGlvbiBmYWlscy4KKworICAgICAgICBzZXRTaXplKCkgc2hvdWxkIGJlIGNhbGxlZCBv bmNlIG9ubHkgZHVyaW5nIGFuIGltYWdlIGRlY29kZSAtIGFkZCBhbiBBU1NFUlQKKyAgICAgICAg Zm9yIHRoYXQuIFJlc2l6ZSB0aGUgYmFja2luZyBzdG9yZSBjYXBhY2l0eSB0byB0aGUgcmVxdWVz dGVkIGltYWdlIHNpemUgYW5kCisgICAgICAgIHJldHVybiBmYWxzZSBpZiBtZW1vcnkgYWxsb2Nh dGlvbiBmYWlscy4KKworICAgICAgICBJbWFnZURlY29kZXI6OmlzT3ZlclNpemUod2lkdGgsIGhl aWdodCkgaXMgY2FsbGVkIHRvIGNoZWNrIHRoYXQgdGhlIGRlY29kZWQKKyAgICAgICAgd2lkdGgg YW5kIGhlaWdodCB3b24ndCBvdmVyZmxvdyAnd2lkdGggeCBoZWlnaHQgeCBzaXplb2YoUGl4ZWxE YXRhKScgYmVmb3JlCisgICAgICAgIGNhbGxzIHRvIHNldFNpemUoKS4gUmVmZXIgdG8gaHR0cDov L3dlYmtpdC5vcmcvYi80ODYzNAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdl RGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lOjpzZXRTaXplKToKKwog MjAxMS0xMS0xOSAgU2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgTW92ZSBnYW1lcGFkIHRvIE1vZHVsZXMvICgrIHNvbWUgY2xlYW51cCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3Bw CmluZGV4IGNhNjM2OWViNGNlOWZlZmZjZWExM2M1MzA0OWQ0ZWUxZmNhMjUwOTkuLjExMGQ5N2Jl NjJkZmRhMTBkNGIxNmEyMmY2OGU3YjY0ZmYzZDc1MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcApAQCAtMTg5 LDE0ICsxODksMTQgQEAgYm9vbCBJbWFnZUZyYW1lOjpjb3B5Qml0bWFwRGF0YShjb25zdCBJbWFn ZUZyYW1lJiBvdGhlcikKIAogYm9vbCBJbWFnZUZyYW1lOjpzZXRTaXplKGludCBuZXdXaWR0aCwg aW50IG5ld0hlaWdodCkKIHsKLSAgICAvLyBOT1RFOiBUaGlzIGhhcyBubyB3YXkgdG8gY2hlY2sg Zm9yIGFsbG9jYXRpb24gZmFpbHVyZSBpZiB0aGUgcmVxdWVzdGVkCi0gICAgLy8gc2l6ZSB3YXMg dG9vIGJpZy4uLgotICAgIG1fYmFja2luZ1N0b3JlLnJlc2l6ZShuZXdXaWR0aCAqIG5ld0hlaWdo dCk7CisgICAgQVNTRVJUKG1fYmFja2luZ1N0b3JlLmlzRW1wdHkoKSk7CisgICAgc2l6ZV90IGJh Y2tpbmdTdG9yZVNpemUgPSBuZXdXaWR0aCAqIG5ld0hlaWdodDsKKyAgICBpZiAoIW1fYmFja2lu Z1N0b3JlLnRyeVJlc2VydmVDYXBhY2l0eShiYWNraW5nU3RvcmVTaXplKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIG1fYnl0ZXMgPSBtX2JhY2tpbmdTdG9yZS5kYXRhKCk7CiAgICAgbV9z aXplID0gSW50U2l6ZShuZXdXaWR0aCwgbmV3SGVpZ2h0KTsKIAogICAgIHplcm9GaWxsUGl4ZWxE YXRhKCk7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAo= 116172 2011-11-21 19:51:19 -0800 2011-11-29 16:19:39 -0800 Patch bug-72864-20111122144848.patch text/plain 2359 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwOTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTNjNGRkZGUyYjcxYWU3 MjRhYWMyODllZDJlN2ExYmEzOTI1ZjgxOS4uOGRkNjZlMjdhY2JhNWEwZjhmMzU4YWEzMDk5MGFh YjhkMjFkYTFhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTIxICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBJbWFnZURlY29kZXIg c2V0U2l6ZSgpIHNob3VsZCBjaGVjayBmb3IgYmFja2luZyBzdG9yZSBhbGxvY2F0aW9uIGZhaWx1 cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODY0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJh Y2tpbmcgc3RvcmUgb2YgYSBkZWNvZGVkIGltYWdlIGlzIGEgVmVjdG9yPFBpeGVsRGF0YT4gb24g dGhlIGFmZmVjdGVkCisgICAgICAgIHBvcnRzLiBBbmQgVmVjdG9yPD4gcHJvdmlkZXMgYSByZXNp emUgY2FwYWNpdHkgbWVtYmVyIHRoYXQgcmV0dXJucyBmYWxzZSBpZgorICAgICAgICBtZW1vcnkg YWxsb2NhdGlvbiBmYWlscy4KKworICAgICAgICBzZXRTaXplKCkgc2hvdWxkIGJlIGNhbGxlZCBv bmNlIG9ubHkgZHVyaW5nIGFuIGltYWdlIGRlY29kZSAtIGFkZCBhbiBBU1NFUlQKKyAgICAgICAg Zm9yIHRoYXQuIFJlc2l6ZSB0aGUgYmFja2luZyBzdG9yZSBjYXBhY2l0eSB0byB0aGUgcmVxdWVz dGVkIGltYWdlIHNpemUgYW5kCisgICAgICAgIHJldHVybiBmYWxzZSBpZiBtZW1vcnkgYWxsb2Nh dGlvbiBmYWlscy4KKworICAgICAgICBJbWFnZURlY29kZXI6OmlzT3ZlclNpemUod2lkdGgsIGhl aWdodCkgaXMgY2FsbGVkIHRvIGNoZWNrIHRoYXQgdGhlIGRlY29kZWQKKyAgICAgICAgd2lkdGgg YW5kIGhlaWdodCB3b24ndCBvdmVyZmxvdyAnd2lkdGggeCBoZWlnaHQgeCBzaXplb2YoUGl4ZWxE YXRhKScgYmVmb3JlCisgICAgICAgIGNhbGxzIHRvIHNldFNpemUoKS4gUmVmZXIgdG8gaHR0cDov L3dlYmtpdC5vcmcvYi80ODYzNAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBm YXN0L2ltYWdlcy9zaXplLWZhaWx1cmUuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRnJhbWU6 OnNldFNpemUpOgorCiAyMDExLTExLTIxICBSYWtlc2ggS04gIDxyYWtlc2gua25AbW90b3JvbGEu Y29tPgogCiAgICAgICAgIE5lZWQgc3VwcG9ydCBmb3IgZGlybmFtZSBhdHRyaWJ1dGUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29k ZXIuY3BwCmluZGV4IGNhNjM2OWViNGNlOWZlZmZjZWExM2M1MzA0OWQ0ZWUxZmNhMjUwOTkuLmYw MjVmYmJlMTVlNWQ2NDZhYmEzNGRmNDM1ZDEyMmY4Y2I3ODE5MTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcApA QCAtMTg5LDE0ICsxODksMTQgQEAgYm9vbCBJbWFnZUZyYW1lOjpjb3B5Qml0bWFwRGF0YShjb25z dCBJbWFnZUZyYW1lJiBvdGhlcikKIAogYm9vbCBJbWFnZUZyYW1lOjpzZXRTaXplKGludCBuZXdX aWR0aCwgaW50IG5ld0hlaWdodCkKIHsKLSAgICAvLyBOT1RFOiBUaGlzIGhhcyBubyB3YXkgdG8g Y2hlY2sgZm9yIGFsbG9jYXRpb24gZmFpbHVyZSBpZiB0aGUgcmVxdWVzdGVkCi0gICAgLy8gc2l6 ZSB3YXMgdG9vIGJpZy4uLgotICAgIG1fYmFja2luZ1N0b3JlLnJlc2l6ZShuZXdXaWR0aCAqIG5l d0hlaWdodCk7CisgICAgQVNTRVJUKCFtX2J5dGVzKTsKKyAgICBzaXplX3QgYmFja2luZ1N0b3Jl U2l6ZSA9IG5ld1dpZHRoICogbmV3SGVpZ2h0OworICAgIGlmICghbV9iYWNraW5nU3RvcmUudHJ5 UmVzZXJ2ZUNhcGFjaXR5KGJhY2tpbmdTdG9yZVNpemUpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgbV9ieXRlcyA9IG1fYmFja2luZ1N0b3JlLmRhdGEoKTsKICAgICBtX3NpemUgPSBJbnRT aXplKG5ld1dpZHRoLCBuZXdIZWlnaHQpOwogCiAgICAgemVyb0ZpbGxQaXhlbERhdGEoKTsKLQog ICAgIHJldHVybiB0cnVlOwogfQogCg== 117068 2011-11-29 16:19:48 -0800 2011-12-04 18:32:13 -0800 Patch bug-72864-20111130111703.patch text/plain 3046 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM0OWE3MThlNjkxNTlk NTJjMGFjMTMzN2FkY2M2Mzk0MmFkZWExYS4uMWEyOWI0ODI3MjM1NGEzZDQ4MDlmZjY0YTA0NWE2 ZTM2NWNiYTY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTExLTI5ICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBJbWFnZURlY29kZXIg c2V0U2l6ZSgpIHNob3VsZCBjaGVjayBmb3IgYmFja2luZyBzdG9yZSBhbGxvY2F0aW9uIGZhaWx1 cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODY0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJh Y2tpbmcgc3RvcmUgb2YgYSBkZWNvZGVkIGltYWdlIGlzIGEgVmVjdG9yPFBpeGVsRGF0YT4gb24g dGhlIGFmZmVjdGVkCisgICAgICAgIHBvcnRzLiBBbmQgVmVjdG9yPD4gcHJvdmlkZXMgYSByZXNp emUgY2FwYWNpdHkgbWVtYmVyIHRoYXQgcmV0dXJucyBmYWxzZSBpZgorICAgICAgICBtZW1vcnkg YWxsb2NhdGlvbiBmYWlscy4KKworICAgICAgICBzZXRTaXplKCkgc2hvdWxkIGJlIGNhbGxlZCBv bmNlIG9ubHkgZHVyaW5nIGFuIGltYWdlIGRlY29kZSAtIGFkZCBhbiBBU1NFUlQKKyAgICAgICAg Zm9yIHRoYXQuIFJlc2l6ZSB0aGUgYmFja2luZyBzdG9yZSBjYXBhY2l0eSB0byB0aGUgcmVxdWVz dGVkIGltYWdlIHNpemUgYW5kCisgICAgICAgIHJldHVybiBmYWxzZSBpZiBtZW1vcnkgYWxsb2Nh dGlvbiBmYWlscy4KKworICAgICAgICBJbWFnZURlY29kZXI6OmlzT3ZlclNpemUod2lkdGgsIGhl aWdodCkgaXMgY2FsbGVkIHRvIGNoZWNrIHRoYXQgdGhlIGRlY29kZWQKKyAgICAgICAgd2lkdGgg YW5kIGhlaWdodCB3b24ndCBvdmVyZmxvdyAnd2lkdGggeCBoZWlnaHQgeCBzaXplb2YoUGl4ZWxE YXRhKScgYmVmb3JlCisgICAgICAgIGNhbGxzIHRvIHNldFNpemUoKS4gUmVmZXIgdG8gaHR0cDov L3dlYmtpdC5vcmcvYi80ODYzNAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBm YXN0L2ltYWdlcy9zaXplLWZhaWx1cmUuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRnJhbWU6 OkltYWdlRnJhbWUpOiBDb25zdHJ1Y3Rpb246IGluaXRpYWxpemUgbV9ieXRlcygwKS4KKyAgICAg ICAgKFdlYkNvcmU6OkltYWdlRnJhbWU6OnNldFNpemUpOgorCiAyMDExLTExLTI5ICBUb255IENo YW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVuYW1lIHNvbWUgZmxleGJveCBm dW5jdGlvbnMgdG8gYmUgbGVzcyBjb25mdXNpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCmluZGV4IGNhNjM2OWVi NGNlOWZlZmZjZWExM2M1MzA0OWQ0ZWUxZmNhMjUwOTkuLjk3YTQ4ODYwMWE4NTc5ZGJiZTY3YTA2 OGExMDczN2JjYWQ1MWUyMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lt YWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcApAQCAtMTI4LDEzICsxMjgsMTQgQEAg SW1hZ2VEZWNvZGVyKiBJbWFnZURlY29kZXI6OmNyZWF0ZShjb25zdCBTaGFyZWRCdWZmZXImIGRh dGEsIEltYWdlU291cmNlOjpBbHBoYU8KICNpZiAhVVNFKFNLSUEpCiAKIEltYWdlRnJhbWU6Oklt YWdlRnJhbWUoKQotICAgIDogbV9oYXNBbHBoYShmYWxzZSkKKyAgICA6IG1fYnl0ZXMoMCkKKyAg ICAsIG1faGFzQWxwaGEoZmFsc2UpCiAgICAgLCBtX3N0YXR1cyhGcmFtZUVtcHR5KQogICAgICwg bV9kdXJhdGlvbigwKQogICAgICwgbV9kaXNwb3NhbE1ldGhvZChEaXNwb3NlTm90U3BlY2lmaWVk KQogICAgICwgbV9wcmVtdWx0aXBseUFscGhhKHRydWUpCiB7Ci19IAorfQogCiBJbWFnZUZyYW1l JiBJbWFnZUZyYW1lOjpvcGVyYXRvcj0oY29uc3QgSW1hZ2VGcmFtZSYgb3RoZXIpCiB7CkBAIC0x ODksMTQgKzE5MCwxNiBAQCBib29sIEltYWdlRnJhbWU6OmNvcHlCaXRtYXBEYXRhKGNvbnN0IElt YWdlRnJhbWUmIG90aGVyKQogCiBib29sIEltYWdlRnJhbWU6OnNldFNpemUoaW50IG5ld1dpZHRo LCBpbnQgbmV3SGVpZ2h0KQogewotICAgIC8vIE5PVEU6IFRoaXMgaGFzIG5vIHdheSB0byBjaGVj ayBmb3IgYWxsb2NhdGlvbiBmYWlsdXJlIGlmIHRoZSByZXF1ZXN0ZWQKLSAgICAvLyBzaXplIHdh cyB0b28gYmlnLi4uCi0gICAgbV9iYWNraW5nU3RvcmUucmVzaXplKG5ld1dpZHRoICogbmV3SGVp Z2h0KTsKKyAgICBBU1NFUlQoIXdpZHRoKCkgJiYgIWhlaWdodCgpKTsKKyAgICBzaXplX3QgYmFj a2luZ1N0b3JlU2l6ZSA9IG5ld1dpZHRoICogbmV3SGVpZ2h0OworICAgIGlmICghbV9iYWNraW5n U3RvcmUudHJ5UmVzZXJ2ZUNhcGFjaXR5KGJhY2tpbmdTdG9yZVNpemUpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgLy8gVmVjdG9yPD4gbV9iYWNraW5nU3RvcmUgaXMgdXNlZCBhcyBhIGJ1 ZmZlciBvZiBieXRlcyBvbmx5LCBhbmQgaXMgYWNjZXNzZWQKKyAgICAvLyB2aWEgdGhlIG1fYnl0 ZXMgbWVtYmVyIG9ubHkuIFRoZXJlIGlzIG5vIG5lZWQgdG8gcmVzaXplKCkgbV9iYWNraW5nU3Rv cmUuCiAgICAgbV9ieXRlcyA9IG1fYmFja2luZ1N0b3JlLmRhdGEoKTsKICAgICBtX3NpemUgPSBJ bnRTaXplKG5ld1dpZHRoLCBuZXdIZWlnaHQpOwogCiAgICAgemVyb0ZpbGxQaXhlbERhdGEoKTsK LQogICAgIHJldHVybiB0cnVlOwogfQogCg== 117821 2011-12-04 18:32:22 -0800 2011-12-04 23:58:35 -0800 Patch for landing bug-72864-20111205132929.patch text/plain 2597 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxOTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY5YjFiOTlmMDEwZmNh Mjk3ZjdlYWEyODVmZTkzNDA5OGIzOWFjNi4uZDYyZTNmMDgwODZiOTIzNjkyNTk5MjQxZDBkZGYy ZjE5NWMyZmYyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTEyLTA0ICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBJbWFnZURlY29kZXIg c2V0U2l6ZSgpIHNob3VsZCBjaGVjayBmb3IgYmFja2luZyBzdG9yZSBhbGxvY2F0aW9uIGZhaWx1 cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODY0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJh Y2tpbmcgc3RvcmUgb2YgYSBkZWNvZGVkIGltYWdlIGlzIGEgVmVjdG9yPFBpeGVsRGF0YT4gb24g dGhlIGFmZmVjdGVkCisgICAgICAgIHBvcnRzLiBBbmQgVmVjdG9yPD4gcHJvdmlkZXMgYSByZXNp emUgY2FwYWNpdHkgbWVtYmVyIHRoYXQgcmV0dXJucyBmYWxzZSBpZgorICAgICAgICBtZW1vcnkg YWxsb2NhdGlvbiBmYWlscy4KKworICAgICAgICBzZXRTaXplKCkgc2hvdWxkIGJlIGNhbGxlZCBv bmNlIG9ubHkgZHVyaW5nIGFuIGltYWdlIGRlY29kZSAtIGFkZCBhbiBBU1NFUlQKKyAgICAgICAg Zm9yIHRoYXQuIFJlc2l6ZSB0aGUgYmFja2luZyBzdG9yZSBjYXBhY2l0eSB0byB0aGUgcmVxdWVz dGVkIGltYWdlIHNpemUgYW5kCisgICAgICAgIHJldHVybiBmYWxzZSBpZiBtZW1vcnkgYWxsb2Nh dGlvbiBmYWlscy4KKworICAgICAgICBJbWFnZURlY29kZXI6OmlzT3ZlclNpemUod2lkdGgsIGhl aWdodCkgaXMgY2FsbGVkIHRvIGNoZWNrIHRoYXQgdGhlIGRlY29kZWQKKyAgICAgICAgd2lkdGgg YW5kIGhlaWdodCB3b24ndCBvdmVyZmxvdyAnd2lkdGggeCBoZWlnaHQgeCBzaXplb2YoUGl4ZWxE YXRhKScgYmVmb3JlCisgICAgICAgIGNhbGxzIHRvIHNldFNpemUoKS4gUmVmZXIgdG8gaHR0cDov L3dlYmtpdC5vcmcvYi80ODYzNAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBm YXN0L2ltYWdlcy9zaXplLWZhaWx1cmUuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRnJhbWU6 OnNldFNpemUpOgorCiAyMDExLTEyLTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3Jn PgogCiAgICAgICAgIEhJRVJBUkNIWV9SRVFVRVNUX0VSUiBjaGVjayBpbiBjaGVja0FjY2VwdENo aWxkIHNob3VsZCBiZSBvcHRpbWl6ZWQgZm9yIG5ld0NoaWxkIHdpdGhvdXQgY2hpbGRyZW4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVj b2Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURl Y29kZXIuY3BwCmluZGV4IGNhNjM2OWViNGNlOWZlZmZjZWExM2M1MzA0OWQ0ZWUxZmNhMjUwOTku LjdiMjg0MzUyNTE1ZGMxYjhlMzYyOTRkYTIzOTEyNTVhZTZmYTg4ZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNw cApAQCAtMTg5LDE0ICsxODksMTYgQEAgYm9vbCBJbWFnZUZyYW1lOjpjb3B5Qml0bWFwRGF0YShj b25zdCBJbWFnZUZyYW1lJiBvdGhlcikKIAogYm9vbCBJbWFnZUZyYW1lOjpzZXRTaXplKGludCBu ZXdXaWR0aCwgaW50IG5ld0hlaWdodCkKIHsKLSAgICAvLyBOT1RFOiBUaGlzIGhhcyBubyB3YXkg dG8gY2hlY2sgZm9yIGFsbG9jYXRpb24gZmFpbHVyZSBpZiB0aGUgcmVxdWVzdGVkCi0gICAgLy8g c2l6ZSB3YXMgdG9vIGJpZy4uLgotICAgIG1fYmFja2luZ1N0b3JlLnJlc2l6ZShuZXdXaWR0aCAq IG5ld0hlaWdodCk7CisgICAgQVNTRVJUKCF3aWR0aCgpICYmICFoZWlnaHQoKSk7CisgICAgc2l6 ZV90IGJhY2tpbmdTdG9yZVNpemUgPSBuZXdXaWR0aCAqIG5ld0hlaWdodDsKKyAgICBpZiAoIW1f YmFja2luZ1N0b3JlLnRyeVJlc2VydmVDYXBhY2l0eShiYWNraW5nU3RvcmVTaXplKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIC8vIFZlY3Rvcjw+IG1fYmFja2luZ1N0b3JlIGlzIHVzZWQg YXMgYSBidWZmZXIgb2YgYnl0ZXMgb25seSwgYW5kIGlzIGFjY2Vzc2VkCisgICAgLy8gdmlhIHRo ZSBtX2J5dGVzIG1lbWJlciBvbmx5LiBUaGVyZSBpcyBubyBuZWVkIHRvIHJlc2l6ZSgpIG1fYmFj a2luZ1N0b3JlLgogICAgIG1fYnl0ZXMgPSBtX2JhY2tpbmdTdG9yZS5kYXRhKCk7CiAgICAgbV9z aXplID0gSW50U2l6ZShuZXdXaWR0aCwgbmV3SGVpZ2h0KTsKIAogICAgIHplcm9GaWxsUGl4ZWxE YXRhKCk7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAo=