136132 2014-08-21 14:40:28 -0700 [GStreamer] ASSERT failure in WebKitWebSource in StreamingClient 2015-02-02 18:05:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 b.long b.long commit-queue pnormand reyndersbrian oldest_to_newest 1030558 0 b.long 2014-08-21 14:40:28 -0700 [GStreamer] Fix double-ref of WebKitWebSource in StreamingClient 1030559 1 236937 b.long 2014-08-21 14:42:05 -0700 Created attachment 236937 Patch 1030561 2 b.long 2014-08-21 14:45:48 -0700 adoptGRef() crashes if the pointer it references isn't floating, and since this code refs right before calling adoptGRef(), it's guaranteed not to be floating. Also, adoptGRef() only exists to avoid ref'ing, which makes it unnecessary in this case. GRefPtr's normal constructor will ref the pointer like we want. 1030563 3 b.long 2014-08-21 14:48:33 -0700 Oh, and static_cast didn't work because WebKitWebSource uses GObject inheritance. Using reinterpret_cast bothers me, but the only other alternatives are a C-style case, or GST_ELEMENT_CAST, which is internally just a C-style cast. I assume an explicit reinterpret_cast is better than a hidden C-style cast, since at least it's obvious that this is "potentially scary" code. 1030564 4 b.long 2014-08-21 14:49:37 -0700 This page causes a crash without this change: http://www.vox.com/2014/8/18/6043763/cnns-jake-tapper-on-the-police-in-ferguson-this-doesnt-make-any-sense Unfortunately, after the change it just locks up. I'll try to track that down too, but I assume it's a completely different issue. 1030688 5 236937 pnormand 2014-08-22 00:03:21 -0700 Comment on attachment 236937 Patch Thanks! This looks good and the change is well explained in the bug comments, perhaps the ChangeLog could also have a small description of the patch? Not everyone goes read bug comments when parsing commit logs :) 1030723 6 236983 b.long 2014-08-22 06:39:48 -0700 Created attachment 236983 Patch 1030724 7 b.long 2014-08-22 06:40:35 -0700 Here you go. I feel like the description is pretty long for something so trivial, but I guess people only look in the commit logs when they need info, so it's potentially useful. 1030731 8 236983 b.long 2014-08-22 08:44:41 -0700 Comment on attachment 236983 Patch I'm going to wait a minute before applying this, since it sounds like it might cause refcounting issues somehow.. 1030813 9 b.long 2014-08-22 15:27:47 -0700 Ok, so I had adoptGRef backwards: It only works if the pointer *isn't* floating. By ref'ing a floating pointer normally, we take ownership of something that we might not have wanted to. I'm trying to figure out why this is causing problems in this case. Presumably by the point of webKitWebSrcStart(), src shouldn't be floating. We don't seem to instantiate it directly though, which means this is presumably being handled by Playbin.. 1030827 10 b.long 2014-08-22 16:11:45 -0700 This ended up a lot more complicated than I expected (the explanation, not the code change). I think the correct thing to do in this case is to use gst_object_ref and gst_object_unref and not use GRefPtr at all, since adoptGRef won't let us do the right thing, and removing that ASSERT is likely to cause a lot more problems, since it's too easy to accidentally adopt a floating pointer. 1030833 11 237008 b.long 2014-08-22 16:35:44 -0700 Created attachment 237008 Patch 1031055 12 237008 pnormand 2014-08-25 00:28:28 -0700 Comment on attachment 237008 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237008&action=review Not setting cq+ yet, is the crack word a typo in the ChangeLog? :) > Source/WebCore/ChangeLog:8 > + don't construct this ourselves, I assume this is happening in Playbin. Yes it happens at least in the HLS case when the demuxer creates a new webkitsrc element using gst_element_make_from_uri() to download a new fragment. I suppose it's similar for DASH. > Source/WebCore/ChangeLog:12 > + This should work, but actually causes the page to either lock up or crack (different crack? :) 1031149 13 237086 b.long 2014-08-25 08:34:47 -0700 Created attachment 237086 Patch 1031150 14 b.long 2014-08-25 08:35:10 -0700 (In reply to comment #12) > (From update of attachment 237008 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=237008&action=review > > Not setting cq+ yet, is the crack word a typo in the ChangeLog? :) > > > Source/WebCore/ChangeLog:8 > > + don't construct this ourselves, I assume this is happening in Playbin. > > Yes it happens at least in the HLS case when the demuxer creates a new webkitsrc element using gst_element_make_from_uri() to download a new fragment. I suppose it's similar for DASH. > > > Source/WebCore/ChangeLog:12 > > + This should work, but actually causes the page to either lock up or crack (different > > crack? :) I meant that the bug was so bad it would literally cause your monitor to crack ;) 1031185 15 237086 commit-queue 2014-08-25 11:34:43 -0700 Comment on attachment 237086 Patch Clearing flags on attachment: 237086 Committed r172928: <http://trac.webkit.org/changeset/172928> 1031186 16 commit-queue 2014-08-25 11:34:46 -0700 All reviewed patches have been landed. Closing bug. 236937 2014-08-21 14:42:05 -0700 2014-08-22 06:39:45 -0700 Patch bug-136132-20140821164156.patch text/plain 1371 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyODM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmU0MWE1NDY2YWI3NTZm OTk0MzA1NTMxMTVmOGViOGU2ZTljOWVkYy4uODJmNzIyZjBiMDUxYjI0ZTc3MmM4MWIyOTFhMTg0 NGYwYzkzNmZjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA4LTIxICBCcmVu ZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBG aXggZG91YmxlLXJlZiBvZiBXZWJLaXRXZWJTb3VyY2UgaW4gU3RyZWFtaW5nQ2xpZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYxMzIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAo U3RyZWFtaW5nQ2xpZW50OjpTdHJlYW1pbmdDbGllbnQpOgorCiAyMDE0LTA4LTIxICBaYWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIFNBVFVSQVRFRF9MQVlP VVRfQVJJVEhNRVRJQy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5j cHAKaW5kZXggZWZjMmUzN2E1MDI2MjUwZDc5YjY5NmIzMDI0OTNiZmEyYzM1YWJhNi4uMWY3MDI2 MDkyMmYxYWI0MDUyMGRiYjkyYjIyMjQxNjY0YzY4YjBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1l ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dl YktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKQEAgLTc3Myw3ICs3NzMsNyBAQCBib29sIHdlYktp dFNyY1Bhc3NlZENPUlNBY2Nlc3NDaGVjayhXZWJLaXRXZWJTcmMqIHNyYykKIH0KIAogU3RyZWFt aW5nQ2xpZW50OjpTdHJlYW1pbmdDbGllbnQoV2ViS2l0V2ViU3JjKiBzcmMpCi0gICAgOiBtX3Ny YyhhZG9wdEdSZWYoc3RhdGljX2Nhc3Q8R3N0RWxlbWVudCo+KGdzdF9vYmplY3RfcmVmKHNyYykp KSkKKyAgICA6IG1fc3JjKHJlaW50ZXJwcmV0X2Nhc3Q8R3N0RWxlbWVudCo+KHNyYykpCiB7CiB9 CiAK 236983 2014-08-22 06:39:48 -0700 2014-08-22 16:35:40 -0700 Patch bug-136132-20140822083940.patch text/plain 1787 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFlZjBjYjNkZTg5N2Zj M2ExZmI2ZGYyZGE2ZjQwMDFkZDZhOThlOC4uNDRkYmRjYTc2MDY1MjA5ZTBlODY1MThmM2FkOWMx YTJiMzU3N2I3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA4LTIxICBCcmVu ZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBG aXggZG91YmxlLXJlZiBvZiBXZWJLaXRXZWJTb3VyY2UgaW4gU3RyZWFtaW5nQ2xpZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYxMzIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBhZG9wdEdSZWYoKSBp cyB1c2VkIHRvIGNyZWF0ZSBhIEdSZWZQdHIgd2l0aG91dCByZWYnaW5nIGl0LCBhbmQgaXQgcmVx dWlyZXMKKyAgICAgICAgdGhhdCB0aGUgcG9pbnRlciBiZSBmbG9hdGluZy4gU2luY2UgdGhpcyBj b2RlIHdhcyByZWYnaW5nIHRoZSBwb2ludGVyIHJpZ2h0CisgICAgICAgIGJlZm9yZSBhZG9wdGlu ZyBpdCwgdGhlIGFkb3B0IHdhcyB1bm5lY2Vzc2FyeSwgYW5kIGFsc28gY2F1c2VkIGFuIGFzc2Vy dAorICAgICAgICBmYWlsdXJlIGJlY2F1c2UgcmVmJ2luZyBhIHBvaW50ZXIgbWFrZXMgaXQgbm90 IGZsb2F0aW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktp dFdlYlNvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChTdHJlYW1pbmdDbGllbnQ6OlN0cmVh bWluZ0NsaWVudCk6IFJlbW92ZSBhZG9wdEdSZWYoKSBhbmQganVzdCB1c2UgR1JlZlB0cigpJ3Mg Y29uc3RydWN0b3IgKHdoaWNoIHdpbGwgcmVmIHRoZSBwb2ludGVyKS4KKwogMjAxNC0wOC0yMiAg WmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRk IHRoZSBXYXlsYW5kIHByb3RvY29sIGV4dGVuc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2Vi U291cmNlR1N0cmVhbWVyLmNwcAppbmRleCBlZmMyZTM3YTUwMjYyNTBkNzliNjk2YjMwMjQ5M2Jm YTJjMzVhYmE2Li4xZjcwMjYwOTIyZjFhYjQwNTIwZGJiOTJiMjIyNDE2NjRjNjhiMGJiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNzczLDcgKzc3 Myw3IEBAIGJvb2wgd2ViS2l0U3JjUGFzc2VkQ09SU0FjY2Vzc0NoZWNrKFdlYktpdFdlYlNyYyog c3JjKQogfQogCiBTdHJlYW1pbmdDbGllbnQ6OlN0cmVhbWluZ0NsaWVudChXZWJLaXRXZWJTcmMq IHNyYykKLSAgICA6IG1fc3JjKGFkb3B0R1JlZihzdGF0aWNfY2FzdDxHc3RFbGVtZW50Kj4oZ3N0 X29iamVjdF9yZWYoc3JjKSkpKQorICAgIDogbV9zcmMocmVpbnRlcnByZXRfY2FzdDxHc3RFbGVt ZW50Kj4oc3JjKSkKIHsKIH0KIAo= 237008 2014-08-22 16:35:44 -0700 2014-08-25 08:34:43 -0700 Patch bug-136132-20140822183535.patch text/plain 6643 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyODc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ5Zjg1N2E5YzU3ZmQx MDU0NGM3Y2ExMTRmZjVjZTNhZjA5YzI4MC4uNmY2YzllYWUxNmRlZjI1OTkxODdkNzY3YTYxNTlh MDQ3MWU2ZDVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA4LTIyICBCcmVu ZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBB U1NFUlQgZmFpbHVyZSBpbiBXZWJLaXRXZWJTb3VyY2UgaW4gU3RyZWFtaW5nQ2xpZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYxMzIKKworICAg ICAgICBhZG9wdEdSZWYoKSBoYXMgYW4gQVNTRVJUIGZhaWx1cmUgaWYgaXQncyB1c2VkIG9uIGEg ZmxvYXRpbmcgcG9pbnRlci4gRm9yIHNvbWUgcmVhc29uLAorICAgICAgICBXZWJLaXRXZWJTcmMq IHNyYyBpbiBTdHJlYW1pbmdDbGllbnQncyBjb25zdHJ1Y3RvciBpcyBmbG9hdGluZy4gU2luY2Ug d2UKKyAgICAgICAgZG9uJ3QgY29uc3RydWN0IHRoaXMgb3Vyc2VsdmVzLCBJIGFzc3VtZSB0aGlz IGlzIGhhcHBlbmluZyBpbiBQbGF5YmluLgorCisgICAgICAgIElmIHdlIHJlbW92ZSB0aGUgcmVm IGFuZCBhZG9wdCwgR1JlZlB0cidzIGNvbnN0cnVjdG9yIGNhbGxzIGdzdF9vYmplY3RfcmVmX3Np bmssCisgICAgICAgIHdoaWNoIHJlbW92ZXMgdGhlIGZsb2F0aW5nIHJlZmVyZW5jZSBhbmQgZG9l c24ndCBpbmNyZW1lbnQgdGhlIHJlZmVyZW5jZSBjb3VudC4KKyAgICAgICAgVGhpcyBzaG91bGQg d29yaywgYnV0IGFjdHVhbGx5IGNhdXNlcyB0aGUgcGFnZSB0byBlaXRoZXIgbG9jayB1cCBvciBj cmFjayAoZGlmZmVyZW50CisgICAgICAgIHJlc3VsdHMgZm9yIGRpZmZlcmVudCB0ZXN0ZXJzKS4K KworICAgICAgICBJbiB0aGlzIGNhc2UsIGl0IHNlZW1zIGxpa2UgdGhlIGFkb3B0R1JlZiAvIGdz dF9vYmplY3RfcmVmIHdhcyB0aGUgY29ycmVjdCB0aGluZyB0byBkbywKKyAgICAgICAgYnV0IGFk b3B0R1JlZiB3b24ndCBhY3R1YWxseSBsZXQgdXMgZG8uIFJlbW92aW5nIHRoZSBBU1NFUlQgaXMg YSBiYWQgaWRlYSwgYmVjYXVzZQorICAgICAgICB1c3VhbGx5IHdlIGRvbid0IHdhbnQgdG8gYWRv cHQgZmxvYXRpbmcgcG9pbnRlcnMuCisKKyAgICAgICAgVGhpcyBpcyBhbGwgYSBsb25nIHdheSBv ZiBzYXlpbmcgdGhhdCBtYWtpbmcgbV9zcmMgYSByYXcgcG9pbnRlciBhbmQgbWFudWFsbHkKKyAg ICAgICAgY2FsbGluZyBnc3Rfb2JqZWN0X3JlZigpLCBhbmQgY2FsbGluZyBnc3Rfb2JqZWN0X3Vu cmVmIGluIHRoZSBkZXN0cnVjdG9yIGlzIHRoZQorICAgICAgICBiZXN0IHNvbHV0aW9uIGluIHRo aXMgY2FzZSwgc2luY2UgaXQgZml4ZXMgdGhlIHByb2JsZW0gd2hpbGUgbGVhdmluZyB0aGUgQVNT RVJUCisgICAgICAgIHRvIHByb3RlY3QgdXMgaW4gdGhlIG11Y2ggbW9yZSBjb21tb24gY2FzZSB3 aGVyZSBhZG9wdGluZyBhIGZsb2F0aW5nIHJlZmVyZW5jZSBpcyBiYWQuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFN0cmVhbWlu Z0NsaWVudDo6U3RyZWFtaW5nQ2xpZW50KTogTWFrZSBtX3NyYyBhIHJhdyBwb2ludGVyIGluc3Rl YWQgb2YgYSBHUmVmUHRyLgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50Ojp+U3RyZWFtaW5nQ2xp ZW50KTogVW5yZWYgbV9zcmMuCisgICAgICAgIChTdHJlYW1pbmdDbGllbnQ6OmNyZWF0ZVJlYWRC dWZmZXIpOiBSZXBsYWNlIG1fc3JjLmdldCgpIHdpdGggbV9zcmMsIHNpbmNlIGl0J3MgYSByYXcg cG9pbnRlciBub3cuCisgICAgICAgIChTdHJlYW1pbmdDbGllbnQ6OmhhbmRsZVJlc3BvbnNlUmVj ZWl2ZWQpOiBTYW1lLgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVEYXRhUmVjZWl2 ZWQpOiBTYW1lLgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVOb3RpZnlGaW5pc2hl ZCk6IFNhbWUuCisgICAgICAgIChDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6bm90aWZ5 RmluaXNoZWQpOiBTYW1lLgorICAgICAgICAoUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6 OmRpZEZhaWwpOiBTYW1lLgorICAgICAgICAoUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6 Ondhc0Jsb2NrZWQpOiBTYW1lLgorICAgICAgICAoUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGll bnQ6OmNhbm5vdFNob3dVUkwpOiBTYW1lLgorCiAyMDE0LTA4LTIyICBDb21taXQgUXVldWUgIDxj b21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91 dCByMTcyODY2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApp bmRleCBlZmMyZTM3YTUwMjYyNTBkNzliNjk2YjMwMjQ5M2JmYTJjMzVhYmE2Li44N2NiMjAzYmNm N2U0YzdiOTc4YjM1Y2JkOTdkMjIxYmJmMDYxZTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNzEsNyArNzEsNyBAQCBjbGFzcyBTdHJlYW1pbmdD bGllbnQgewogICAgICAgICB2b2lkIGhhbmRsZURhdGFSZWNlaXZlZChjb25zdCBjaGFyKiwgaW50 KTsKICAgICAgICAgdm9pZCBoYW5kbGVOb3RpZnlGaW5pc2hlZCgpOwogCi0gICAgICAgIEdSZWZQ dHI8R3N0RWxlbWVudD4gbV9zcmM7CisgICAgICAgIEdzdEVsZW1lbnQqIG1fc3JjOwogfTsKIAog Y2xhc3MgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQgOiBwdWJsaWMgQ2FjaGVkUmF3UmVz b3VyY2VDbGllbnQsIHB1YmxpYyBTdHJlYW1pbmdDbGllbnQgewpAQCAtNzczLDE3ICs3NzMsMTgg QEAgYm9vbCB3ZWJLaXRTcmNQYXNzZWRDT1JTQWNjZXNzQ2hlY2soV2ViS2l0V2ViU3JjKiBzcmMp CiB9CiAKIFN0cmVhbWluZ0NsaWVudDo6U3RyZWFtaW5nQ2xpZW50KFdlYktpdFdlYlNyYyogc3Jj KQotICAgIDogbV9zcmMoYWRvcHRHUmVmKHN0YXRpY19jYXN0PEdzdEVsZW1lbnQqPihnc3Rfb2Jq ZWN0X3JlZihzcmMpKSkpCisgICAgOiBtX3NyYyhzdGF0aWNfY2FzdDxHc3RFbGVtZW50Kj4oZ3N0 X29iamVjdF9yZWYoc3JjKSkpCiB7CiB9CiAKIFN0cmVhbWluZ0NsaWVudDo6flN0cmVhbWluZ0Ns aWVudCgpCiB7CisgICAgZ3N0X29iamVjdF91bnJlZihtX3NyYyk7CiB9CiAKIGNoYXIqIFN0cmVh bWluZ0NsaWVudDo6Y3JlYXRlUmVhZEJ1ZmZlcihzaXplX3QgcmVxdWVzdGVkU2l6ZSwgc2l6ZV90 JiBhY3R1YWxTaXplKQogewotICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMo bV9zcmMuZ2V0KCkpOworICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMobV9z cmMpOwogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7CiAKICAgICBB U1NFUlQoIXByaXYtPmJ1ZmZlcik7CkBAIC04MDIsNyArODAzLDcgQEAgY2hhciogU3RyZWFtaW5n Q2xpZW50OjpjcmVhdGVSZWFkQnVmZmVyKHNpemVfdCByZXF1ZXN0ZWRTaXplLCBzaXplX3QmIGFj dHVhbFNpemUKIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmhhbmRsZVJlc3BvbnNlUmVjZWl2ZWQo Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIENPUlNBY2Nlc3NDaGVja1Jlc3VsdCBj b3JzQWNjZXNzQ2hlY2spCiB7Ci0gICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NS QyhtX3NyYy5nZXQoKSk7CisgICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyht X3NyYyk7CiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+cHJpdjsKIAogICAg IEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiUmVjZWl2ZWQgcmVzcG9uc2U6ICVkIiwgcmVzcG9uc2Uu aHR0cFN0YXR1c0NvZGUoKSk7CkBAIC05MTQsNyArOTE1LDcgQEAgdm9pZCBTdHJlYW1pbmdDbGll bnQ6OmhhbmRsZVJlc3BvbnNlUmVjZWl2ZWQoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UsIEMKIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmhhbmRsZURhdGFSZWNlaXZlZChjb25zdCBj aGFyKiBkYXRhLCBpbnQgbGVuZ3RoKQogewotICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lU X1dFQl9TUkMobV9zcmMuZ2V0KCkpOworICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dF Ql9TUkMobV9zcmMpOwogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7 CiAKICAgICBHTXV0ZXhMb2NrZXIgbG9ja2VyKCpHU1RfT0JKRUNUX0dFVF9MT0NLKHNyYykpOwpA QCAtOTgxLDcgKzk4Miw3IEBAIHZvaWQgU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVEYXRhUmVjZWl2 ZWQoY29uc3QgY2hhciogZGF0YSwgaW50IGxlbmd0aCkKIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6 OmhhbmRsZU5vdGlmeUZpbmlzaGVkKCkKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJ VF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9X RUJfU1JDKG1fc3JjKTsKICAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2 OwogCiAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJIYXZlIEVPUyIpOwpAQCAtMTA1NCw3ICsx MDU1LDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6ZGF0YVJlY2VpdmVk KENhY2hlZFJlc291cmNlKiwgY29uc3QgY2hhciogZGEKIHZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJl YW1pbmdDbGllbnQ6Om5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkKIHsK ICAgICBpZiAocmVzb3VyY2UtPmxvYWRGYWlsZWRPckNhbmNlbGVkKCkpIHsKLSAgICAgICAgV2Vi S2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhtX3NyYy5nZXQoKSk7CisgICAgICAgIFdl YktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMobV9zcmMpOwogCiAgICAgICAgIGlmICgh cmVzb3VyY2UtPndhc0NhbmNlbGVkKCkpIHsKICAgICAgICAgICAgIGNvbnN0IFJlc291cmNlRXJy b3ImIGVycm9yID0gcmVzb3VyY2UtPnJlc291cmNlRXJyb3IoKTsKQEAgLTExMzEsNyArMTEzMiw3 IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6OmRpZEZpbmlzaExvYWRpbmco UmVzb3VyY2VIYW5kbGUqLCBkb3VibGUpCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdD bGllbnQ6OmRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJv cikKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9XRUJfU1JDKG1fc3JjLmdldCgp KTsKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9XRUJfU1JDKG1fc3JjKTsKIAogICAg IEdTVF9FUlJPUl9PQkpFQ1Qoc3JjLCAiSGF2ZSBmYWlsdXJlOiAlcyIsIGVycm9yLmxvY2FsaXpl ZERlc2NyaXB0aW9uKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgR1NUX0VMRU1FTlRfRVJST1Ioc3Jj LCBSRVNPVVJDRSwgRkFJTEVELCAoIiVzIiwgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKS51 dGY4KCkuZGF0YSgpKSwgKDApKTsKQEAgLTExNDAsNyArMTE0MSw3IEBAIHZvaWQgUmVzb3VyY2VI YW5kbGVTdHJlYW1pbmdDbGllbnQ6OmRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNv dXJjZUVycm9yCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6Ondhc0Jsb2Nr ZWQoUmVzb3VyY2VIYW5kbGUqKQogewotICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dF Ql9TUkMobV9zcmMuZ2V0KCkpOworICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9T UkMobV9zcmMpOwogICAgIEdVbmlxdWVQdHI8Z2NoYXI+IHVyaTsKIAogICAgIEdTVF9FUlJPUl9P QkpFQ1Qoc3JjLCAiUmVxdWVzdCB3YXMgYmxvY2tlZCIpOwpAQCAtMTE1NCw3ICsxMTU1LDcgQEAg dm9pZCBSZXNvdXJjZUhhbmRsZVN0cmVhbWluZ0NsaWVudDo6d2FzQmxvY2tlZChSZXNvdXJjZUhh bmRsZSopCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6OmNhbm5vdFNob3dV UkwoUmVzb3VyY2VIYW5kbGUqKQogewotICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dF Ql9TUkMobV9zcmMuZ2V0KCkpOworICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9T UkMobV9zcmMpOwogICAgIEdVbmlxdWVQdHI8Z2NoYXI+IHVyaTsKIAogICAgIEdTVF9FUlJPUl9P QkpFQ1Qoc3JjLCAiQ2Fubm90IHNob3cgVVJMIik7Cg== 237086 2014-08-25 08:34:47 -0700 2014-08-25 11:34:43 -0700 Patch bug-136132-20140825103439.patch text/plain 6653 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyOTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJlYzg0OTkxNTAzN2Ez NzNkNmRhNGQxYjAzODYzMWNhNTg5ZTMwZi4uMGJlYzRmZmY0MzY2NmQ3Y2VjNjgyZDJmMGQ3OGM3 MmRkMDNhMDljMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA4LTIyICBCcmVu ZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBB U1NFUlQgZmFpbHVyZSBpbiBXZWJLaXRXZWJTb3VyY2UgaW4gU3RyZWFtaW5nQ2xpZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYxMzIKKworICAg ICAgICBhZG9wdEdSZWYoKSBoYXMgYW4gQVNTRVJUIGZhaWx1cmUgaWYgaXQncyB1c2VkIG9uIGEg ZmxvYXRpbmcgcG9pbnRlci4gRm9yIHNvbWUgcmVhc29uLAorICAgICAgICBXZWJLaXRXZWJTcmMq IHNyYyBpbiBTdHJlYW1pbmdDbGllbnQncyBjb25zdHJ1Y3RvciBpcyBmbG9hdGluZy4gU2luY2Ug d2UKKyAgICAgICAgZG9uJ3QgY29uc3RydWN0IHRoaXMgb3Vyc2VsdmVzLCBJIGFzc3VtZSB0aGlz IGlzIGhhcHBlbmluZyBpbiBQbGF5YmluLgorCisgICAgICAgIElmIHdlIHJlbW92ZSB0aGUgcmVm IGFuZCBhZG9wdCwgR1JlZlB0cidzIGNvbnN0cnVjdG9yIGNhbGxzIGdzdF9vYmplY3RfcmVmX3Np bmssCisgICAgICAgIHdoaWNoIHJlbW92ZXMgdGhlIGZsb2F0aW5nIHJlZmVyZW5jZSBhbmQgZG9l c24ndCBpbmNyZW1lbnQgdGhlIHJlZmVyZW5jZSBjb3VudC4KKyAgICAgICAgVGhpcyBzaG91bGQg d29yaywgYnV0IGFjdHVhbGx5IGNhdXNlcyB0aGUgcGFnZSB0byBlaXRoZXIgbG9jayB1cCBvciBj cmFzaCAoZGlmZmVyZW50CisgICAgICAgIHJlc3VsdHMgZm9yIGRpZmZlcmVudCB0ZXN0ZXJzKS4K KworICAgICAgICBJbiB0aGlzIGNhc2UsIGl0IHNlZW1zIGxpa2UgdGhlIGFkb3B0R1JlZiAvIGdz dF9vYmplY3RfcmVmIHdhcyB0aGUgY29ycmVjdCB0aGluZyB0byBkbywKKyAgICAgICAgYnV0IGFk b3B0R1JlZiB3b24ndCBhY3R1YWxseSBsZXQgdXMgZG8uIFJlbW92aW5nIHRoZSBBU1NFUlQgaXMg YSBiYWQgaWRlYSwgYmVjYXVzZQorICAgICAgICB1c3VhbGx5IHdlIGRvbid0IHdhbnQgdG8gYWRv cHQgZmxvYXRpbmcgcG9pbnRlcnMuCisKKyAgICAgICAgVGhpcyBpcyBhbGwgYSBsb25nIHdheSBv ZiBzYXlpbmcgdGhhdCBtYWtpbmcgbV9zcmMgYSByYXcgcG9pbnRlciBhbmQgbWFudWFsbHkKKyAg ICAgICAgY2FsbGluZyBnc3Rfb2JqZWN0X3JlZigpLCBhbmQgY2FsbGluZyBnc3Rfb2JqZWN0X3Vu cmVmIGluIHRoZSBkZXN0cnVjdG9yIGlzIHRoZQorICAgICAgICBiZXN0IHNvbHV0aW9uIGluIHRo aXMgY2FzZSwgc2luY2UgaXQgZml4ZXMgdGhlIHByb2JsZW0gd2hpbGUgbGVhdmluZyB0aGUgQVNT RVJUCisgICAgICAgIHRvIHByb3RlY3QgdXMgaW4gdGhlIG11Y2ggbW9yZSBjb21tb24gY2FzZSB3 aGVyZSBhZG9wdGluZyBhIGZsb2F0aW5nIHJlZmVyZW5jZSBpcyBiYWQuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFN0cmVhbWlu Z0NsaWVudDo6U3RyZWFtaW5nQ2xpZW50KTogTWFrZSBtX3NyYyBhIHJhdyBwb2ludGVyIGluc3Rl YWQgb2YgYSBHUmVmUHRyLgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50Ojp+U3RyZWFtaW5nQ2xp ZW50KTogVW5yZWYgbV9zcmMuCisgICAgICAgIChTdHJlYW1pbmdDbGllbnQ6OmNyZWF0ZVJlYWRC dWZmZXIpOiBSZXBsYWNlIG1fc3JjLmdldCgpIHdpdGggbV9zcmMsIHNpbmNlIGl0J3MgYSByYXcg cG9pbnRlciBub3cuCisgICAgICAgIChTdHJlYW1pbmdDbGllbnQ6OmhhbmRsZVJlc3BvbnNlUmVj ZWl2ZWQpOiBTYW1lLgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVEYXRhUmVjZWl2 ZWQpOiBTYW1lLgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVOb3RpZnlGaW5pc2hl ZCk6IFNhbWUuCisgICAgICAgIChDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6bm90aWZ5 RmluaXNoZWQpOiBTYW1lLgorICAgICAgICAoUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6 OmRpZEZhaWwpOiBTYW1lLgorICAgICAgICAoUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6 Ondhc0Jsb2NrZWQpOiBTYW1lLgorICAgICAgICAoUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGll bnQ6OmNhbm5vdFNob3dVUkwpOiBTYW1lLgorCiAyMDE0LTA4LTI1ICBaYW4gRG9iZXJzZWsgIDx6 ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgUG9wdXBNZW51R3Rr LCBTZWFyY2hQb3B1cE1lbnVHdGsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJl YW1lci5jcHAKaW5kZXggZWZjMmUzN2E1MDI2MjUwZDc5YjY5NmIzMDI0OTNiZmEyYzM1YWJhNi4u ODdjYjIwM2JjZjdlNGM3Yjk3OGIzNWNiZDk3ZDIyMWJiZjA2MWUyNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKQEAgLTcxLDcgKzcxLDcgQEAgY2xhc3Mg U3RyZWFtaW5nQ2xpZW50IHsKICAgICAgICAgdm9pZCBoYW5kbGVEYXRhUmVjZWl2ZWQoY29uc3Qg Y2hhciosIGludCk7CiAgICAgICAgIHZvaWQgaGFuZGxlTm90aWZ5RmluaXNoZWQoKTsKIAotICAg ICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fc3JjOworICAgICAgICBHc3RFbGVtZW50KiBtX3Ny YzsKIH07CiAKIGNsYXNzIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50IDogcHVibGljIENh Y2hlZFJhd1Jlc291cmNlQ2xpZW50LCBwdWJsaWMgU3RyZWFtaW5nQ2xpZW50IHsKQEAgLTc3Mywx NyArNzczLDE4IEBAIGJvb2wgd2ViS2l0U3JjUGFzc2VkQ09SU0FjY2Vzc0NoZWNrKFdlYktpdFdl YlNyYyogc3JjKQogfQogCiBTdHJlYW1pbmdDbGllbnQ6OlN0cmVhbWluZ0NsaWVudChXZWJLaXRX ZWJTcmMqIHNyYykKLSAgICA6IG1fc3JjKGFkb3B0R1JlZihzdGF0aWNfY2FzdDxHc3RFbGVtZW50 Kj4oZ3N0X29iamVjdF9yZWYoc3JjKSkpKQorICAgIDogbV9zcmMoc3RhdGljX2Nhc3Q8R3N0RWxl bWVudCo+KGdzdF9vYmplY3RfcmVmKHNyYykpKQogewogfQogCiBTdHJlYW1pbmdDbGllbnQ6On5T dHJlYW1pbmdDbGllbnQoKQogeworICAgIGdzdF9vYmplY3RfdW5yZWYobV9zcmMpOwogfQogCiBj aGFyKiBTdHJlYW1pbmdDbGllbnQ6OmNyZWF0ZVJlYWRCdWZmZXIoc2l6ZV90IHJlcXVlc3RlZFNp emUsIHNpemVfdCYgYWN0dWFsU2l6ZSkKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJ VF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9X RUJfU1JDKG1fc3JjKTsKICAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2 OwogCiAgICAgQVNTRVJUKCFwcml2LT5idWZmZXIpOwpAQCAtODAyLDcgKzgwMyw3IEBAIGNoYXIq IFN0cmVhbWluZ0NsaWVudDo6Y3JlYXRlUmVhZEJ1ZmZlcihzaXplX3QgcmVxdWVzdGVkU2l6ZSwg c2l6ZV90JiBhY3R1YWxTaXplCiAKIHZvaWQgU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVSZXNwb25z ZVJlY2VpdmVkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBDT1JTQWNjZXNzQ2hl Y2tSZXN1bHQgY29yc0FjY2Vzc0NoZWNrKQogewotICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VC S0lUX1dFQl9TUkMobV9zcmMuZ2V0KCkpOworICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lU X1dFQl9TUkMobV9zcmMpOwogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnBy aXY7CiAKICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIlJlY2VpdmVkIHJlc3BvbnNlOiAlZCIs IHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOwpAQCAtOTE0LDcgKzkxNSw3IEBAIHZvaWQgU3Ry ZWFtaW5nQ2xpZW50OjpoYW5kbGVSZXNwb25zZVJlY2VpdmVkKGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlLCBDCiAKIHZvaWQgU3RyZWFtaW5nQ2xpZW50OjpoYW5kbGVEYXRhUmVjZWl2 ZWQoY29uc3QgY2hhciogZGF0YSwgaW50IGxlbmd0aCkKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNy YyA9IFdFQktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9 IFdFQktJVF9XRUJfU1JDKG1fc3JjKTsKICAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0g c3JjLT5wcml2OwogCiAgICAgR011dGV4TG9ja2VyIGxvY2tlcigqR1NUX09CSkVDVF9HRVRfTE9D SyhzcmMpKTsKQEAgLTk4MSw3ICs5ODIsNyBAQCB2b2lkIFN0cmVhbWluZ0NsaWVudDo6aGFuZGxl RGF0YVJlY2VpdmVkKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgpCiAKIHZvaWQgU3RyZWFt aW5nQ2xpZW50OjpoYW5kbGVOb3RpZnlGaW5pc2hlZCgpCiB7Ci0gICAgV2ViS2l0V2ViU3JjKiBz cmMgPSBXRUJLSVRfV0VCX1NSQyhtX3NyYy5nZXQoKSk7CisgICAgV2ViS2l0V2ViU3JjKiBzcmMg PSBXRUJLSVRfV0VCX1NSQyhtX3NyYyk7CiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9 IHNyYy0+cHJpdjsKIAogICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiSGF2ZSBFT1MiKTsKQEAg LTEwNTQsNyArMTA1NSw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRh dGFSZWNlaXZlZChDYWNoZWRSZXNvdXJjZSosIGNvbnN0IGNoYXIqIGRhCiB2b2lkIENhY2hlZFJl c291cmNlU3RyZWFtaW5nQ2xpZW50Ojpub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSogcmVz b3VyY2UpCiB7CiAgICAgaWYgKHJlc291cmNlLT5sb2FkRmFpbGVkT3JDYW5jZWxlZCgpKSB7Ci0g ICAgICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMobV9zcmMuZ2V0KCkpOwor ICAgICAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9XRUJfU1JDKG1fc3JjKTsKIAogICAg ICAgICBpZiAoIXJlc291cmNlLT53YXNDYW5jZWxlZCgpKSB7CiAgICAgICAgICAgICBjb25zdCBS ZXNvdXJjZUVycm9yJiBlcnJvciA9IHJlc291cmNlLT5yZXNvdXJjZUVycm9yKCk7CkBAIC0xMTMx LDcgKzExMzIsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlU3RyZWFtaW5nQ2xpZW50OjpkaWRGaW5p c2hMb2FkaW5nKFJlc291cmNlSGFuZGxlKiwgZG91YmxlKQogCiB2b2lkIFJlc291cmNlSGFuZGxl U3RyZWFtaW5nQ2xpZW50OjpkaWRGYWlsKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VF cnJvciYgZXJyb3IpCiB7Ci0gICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyht X3NyYy5nZXQoKSk7CisgICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhtX3Ny Yyk7CiAKICAgICBHU1RfRVJST1JfT0JKRUNUKHNyYywgIkhhdmUgZmFpbHVyZTogJXMiLCBlcnJv ci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpLnV0ZjgoKS5kYXRhKCkpOwogICAgIEdTVF9FTEVNRU5U X0VSUk9SKHNyYywgUkVTT1VSQ0UsIEZBSUxFRCwgKCIlcyIsIGVycm9yLmxvY2FsaXplZERlc2Ny aXB0aW9uKCkudXRmOCgpLmRhdGEoKSksICgwKSk7CkBAIC0xMTQwLDcgKzExNDEsNyBAQCB2b2lk IFJlc291cmNlSGFuZGxlU3RyZWFtaW5nQ2xpZW50OjpkaWRGYWlsKFJlc291cmNlSGFuZGxlKiwg Y29uc3QgUmVzb3VyY2VFcnJvcgogCiB2b2lkIFJlc291cmNlSGFuZGxlU3RyZWFtaW5nQ2xpZW50 Ojp3YXNCbG9ja2VkKFJlc291cmNlSGFuZGxlKikKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9 IFdFQktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdF QktJVF9XRUJfU1JDKG1fc3JjKTsKICAgICBHVW5pcXVlUHRyPGdjaGFyPiB1cmk7CiAKICAgICBH U1RfRVJST1JfT0JKRUNUKHNyYywgIlJlcXVlc3Qgd2FzIGJsb2NrZWQiKTsKQEAgLTExNTQsNyAr MTE1NSw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6Ondhc0Jsb2NrZWQo UmVzb3VyY2VIYW5kbGUqKQogCiB2b2lkIFJlc291cmNlSGFuZGxlU3RyZWFtaW5nQ2xpZW50Ojpj YW5ub3RTaG93VVJMKFJlc291cmNlSGFuZGxlKikKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9 IFdFQktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdF QktJVF9XRUJfU1JDKG1fc3JjKTsKICAgICBHVW5pcXVlUHRyPGdjaGFyPiB1cmk7CiAKICAgICBH U1RfRVJST1JfT0JKRUNUKHNyYywgIkNhbm5vdCBzaG93IFVSTCIpOwo=