36625 2010-03-25 16:05:35 -0700 Modify NotificationPresenter::checkPermission() to pass the full source url rather than just the security origin 2010-03-29 18:38:15 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 rafaelw webkit-unassigned aa commit-queue eric fishd johnnyg oldest_to_newest 204278 0 rafaelw 2010-03-25 16:05:35 -0700 The chromium client needs the full URL of the requesting frame. 204283 1 51688 rafaelw 2010-03-25 16:13:35 -0700 Created attachment 51688 Patch 204302 2 aa 2010-03-25 16:40:56 -0700 I think that you will need to fix the Windows port as well. 204306 3 51691 rafaelw 2010-03-25 16:47:48 -0700 Created attachment 51691 Patch 204309 4 eric 2010-03-25 16:53:17 -0700 This is to work around a GKURL KURL difference, correct? 204312 5 51693 rafaelw 2010-03-25 17:01:36 -0700 Created attachment 51693 Patch 204313 6 51693 abarth 2010-03-25 17:05:10 -0700 Comment on attachment 51693 Patch Ok. There might be some subtle issues if a sandboxed iframe tries to use the notification API. With this design, it might inherit the privileges of its origin. Would you be willing to file a bug about that issue and attach a test case? 204920 7 fishd 2010-03-26 19:55:58 -0700 (In reply to comment #4) > This is to work around a GKURL KURL difference, correct? If this is true, then can we eliminate the difference? 204921 8 51693 fishd 2010-03-26 19:57:30 -0700 Comment on attachment 51693 Patch > +++ b/WebKit/chromium/public/WebNotificationPresenter.h > @@ -62,7 +62,7 @@ public: > > // Checks the permission level for the given origin. > // FIXME: This should become abstract when the below is removed. > - virtual Permission checkPermission(const WebSecurityOrigin& origin) > + virtual Permission checkPermission(const WebURL& url) Doesn't this make for a two-sided commit? Can we avoid such complexity by preserving the old API in a deprecated form and then remove it via a follow-up patch? 205006 9 aa 2010-03-27 10:11:29 -0700 (In reply to comment #7) > (In reply to comment #4) > > This is to work around a GKURL KURL difference, correct? > > If this is true, then can we eliminate the difference? It isn't true. Eric was getting this patch confused with something else I was talking to him about the same day. There is a difference between GURL and KURL though. See: https://bugs.webkit.org/show_bug.cgi?id=36623(In reply to comment #8) > (From update of attachment 51693 [details]) > > +++ b/WebKit/chromium/public/WebNotificationPresenter.h > > @@ -62,7 +62,7 @@ public: > > > > // Checks the permission level for the given origin. > > // FIXME: This should become abstract when the below is removed. > > - virtual Permission checkPermission(const WebSecurityOrigin& origin) > > + virtual Permission checkPermission(const WebURL& url) > > Doesn't this make for a two-sided commit? Can we avoid such complexity > by preserving the old API in a deprecated form and then remove it via > a follow-up patch? No. Note the WebSecurityOrigin signature is not used in Chromium and has a default implementation. It was a previous (aborted) attempt at this same change, and is intended to be made in three non-breaking steps. BTW, We need a name for the desired way to make webkit changes. Air-lock? Three-phase? 205044 10 fishd 2010-03-27 13:28:35 -0700 (In reply to comment #9) > There is a difference between GURL and KURL though. See: > > https://bugs.webkit.org/show_bug.cgi?id=36623 Ah, yes. I'm familiar with that bug. It wasn't clear to me that it related to differences between KURL and KURLGoogle. (In reply to comment #8) > No. Note the WebSecurityOrigin signature is not used in Chromium and has a > default implementation. It was a previous (aborted) attempt at this same > change, and is intended to be made in three non-breaking steps. Ah, sounds good. > BTW, We need a name for the desired way to make webkit changes. Air-lock? > Three-phase? Trifecta, Hat-trick, ... I'd vote for three-phase :) 205225 11 rafaelw 2010-03-28 13:39:17 -0700 @abarth: I've created https://bugs.webkit.org/show_bug.cgi?id=36732 and attached a test for the sandboxing issue you identified. 205790 12 51693 commit-queue 2010-03-29 18:38:10 -0700 Comment on attachment 51693 Patch Clearing flags on attachment: 51693 Committed r56756: <http://trac.webkit.org/changeset/56756> 205791 13 commit-queue 2010-03-29 18:38:15 -0700 All reviewed patches have been landed. Closing bug. 51688 2010-03-25 16:13:35 -0700 2010-03-25 16:47:45 -0700 Patch bug-36625-20100325161333.patch text/plain 6319 rafaelw ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTMyMTQ3YS4uMjVkMDdjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMy0yNSAgUmFmYWVsIFdlaW5z dGVpbiAgPHJhZmFlbHdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OmNoZWNr UGVybWlzc2lvbigpIHRvIHRha2UgdGhlIHNvdXJjZSBmcmFtZXMgZnVsbCBLVVJMLAorICAgICAg ICByYXRoZXIgdGhhbiBpdHMgU2VjdXJpdHlPcmlnaW4uCisKKyAgICAgICAgKiBub3RpZmljYXRp b25zL05vdGlmaWNhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246Ok5v dGlmaWNhdGlvbik6CisgICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uQ2VudGVyOjpjaGVja1Blcm1pc3Np b24pOgorICAgICAgICAqIG5vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVyLmg6CisK IDIwMTAtMDMtMjUgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9u b3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90 aWZpY2F0aW9uLmNwcAppbmRleCA5NzYzZjdiLi40NTgyYzgzIDEwMDY0NAotLS0gYS9XZWJDb3Jl L25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmNwcApAQCAtNDksNyArNDksNyBAQCBOb3RpZmljYXRpb246Ok5vdGlm aWNhdGlvbihjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwgRQogICAgICwgbV9wcmVzZW50ZXIocHJvdmlkZXIpCiB7CiAgICAgQVNTRVJUKG1fcHJlc2Vu dGVyKTsKLSAgICBpZiAobV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihjb250ZXh0LT5zZWN1 cml0eU9yaWdpbigpKSAhPSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb25BbGxvd2Vk KSB7CisgICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCkp ICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKICAgICAgICAg ZWMgPSBTRUNVUklUWV9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02OSw3ICs2OSw3 IEBAIE5vdGlmaWNhdGlvbjo6Tm90aWZpY2F0aW9uKGNvbnN0IE5vdGlmaWNhdGlvbkNvbnRlbnRz JiBjb250ZW50cywgU2NyaXB0RXhlY3V0aW9uCiAgICAgLCBtX3ByZXNlbnRlcihwcm92aWRlcikK IHsKICAgICBBU1NFUlQobV9wcmVzZW50ZXIpOwotICAgIGlmIChtX3ByZXNlbnRlci0+Y2hlY2tQ ZXJtaXNzaW9uKGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCkpICE9IE5vdGlmaWNhdGlvblByZXNl bnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKKyAgICBpZiAobV9wcmVzZW50ZXItPmNoZWNrUGVy bWlzc2lvbihjb250ZXh0LT51cmwoKSkgIT0gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNz aW9uQWxsb3dlZCkgewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgcmV0dXJu OwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25D ZW50ZXIuY3BwIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRlci5jcHAK aW5kZXggMjA1YjlhOS4uODA4OWQ4NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9ub3RpZmljYXRpb25z L05vdGlmaWNhdGlvbkNlbnRlci5jcHAKKysrIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlm aWNhdGlvbkNlbnRlci5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgaW50IE5vdGlmaWNhdGlvbkNlbnRl cjo6Y2hlY2tQZXJtaXNzaW9uKCkKIHsKICAgICBpZiAoIXByZXNlbnRlcigpKQogICAgICAgICBy ZXR1cm4gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uRGVuaWVkOwotICAgIHJldHVy biBtX25vdGlmaWNhdGlvblByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKG1fc2NyaXB0RXhlY3V0 aW9uQ29udGV4dC0+c2VjdXJpdHlPcmlnaW4oKSk7CisgICAgcmV0dXJuIG1fbm90aWZpY2F0aW9u UHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT51cmwo KSk7CiB9CiAKIHZvaWQgTm90aWZpY2F0aW9uQ2VudGVyOjpyZXF1ZXN0UGVybWlzc2lvbihQYXNz UmVmUHRyPFZvaWRDYWxsYmFjaz4gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9XZWJDb3JlL25vdGlm aWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVyLmggYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMv Tm90aWZpY2F0aW9uUHJlc2VudGVyLmgKaW5kZXggOWFiZjhhOS4uMTkzZWIyYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oCisrKyBiL1dl YkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaApAQCAtNzIsNyArNzIs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVy bWlzc2lvbihTZWN1cml0eU9yaWdpbiosIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPikgPSAwOwog CiAgICAgICAgIC8vIENoZWNrcyB0aGUgY3VycmVudCBsZXZlbCBvZiBwZXJtaXNzaW9uLgotICAg ICAgICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2luKikg PSAwOworICAgICAgICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IEtV UkwmKSA9IDA7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5k ZXggZjhjMmU0NC4uNDhhNDZlNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAt MDMtMjUgIFJhZmFlbCBXZWluc3RlaW4gIDxyYWZhZWx3QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgTm90aWZpY2F0 aW9uUHJlc2VudGVyOjpjaGVja1Blcm1pc3Npb24oKSB0byB0YWtlIHRoZSBzb3VyY2UgZnJhbWVz IGZ1bGwgS1VSTCwKKyAgICAgICAgcmF0aGVyIHRoYW4gaXRzIFNlY3VyaXR5T3JpZ2luLgorCisg ICAgICAgICogcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRlci5oOgorICAgICAgICAoV2Vi S2l0OjpXZWJOb3RpZmljYXRpb25QcmVzZW50ZXI6OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAg ICogc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpO b3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24pOgorICAgICAgICAqIHNy Yy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmg6CisKIDIwMTAtMDMtMjUgIEpvY2hlbiBFaXNp bmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15 IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb3RpZmljYXRp b25QcmVzZW50ZXIuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJl c2VudGVyLmgKaW5kZXggNzNjM2I1Ni4uZmI2MzI2MiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaAorKysgYi9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRlci5oCkBAIC02Miw3ICs2Miw3IEBAIHB1 YmxpYzoKIAogICAgIC8vIENoZWNrcyB0aGUgcGVybWlzc2lvbiBsZXZlbCBmb3IgdGhlIGdpdmVu IG9yaWdpbi4KICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmVjb21lIGFic3RyYWN0IHdoZW4g dGhlIGJlbG93IGlzIHJlbW92ZWQuCi0gICAgdmlydHVhbCBQZXJtaXNzaW9uIGNoZWNrUGVybWlz c2lvbihjb25zdCBXZWJTZWN1cml0eU9yaWdpbiYgb3JpZ2luKQorICAgIHZpcnR1YWwgUGVybWlz c2lvbiBjaGVja1Blcm1pc3Npb24oY29uc3QgV2ViVVJMJiB1cmwpCiAgICAgewogICAgICAgICBy ZXR1cm4gUGVybWlzc2lvbk5vdEFsbG93ZWQ7CiAgICAgfTsKZGlmZiAtLWdpdCBhL1dlYktpdC9j aHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAgYi9XZWJLaXQvY2hyb21p dW0vc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwCmluZGV4IGQwYTdlMzkuLjFkYWY2 ODggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVy SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmNwcApAQCAtOTEsMTMgKzkxLDEzIEBAIHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVySW1w bDo6bm90aWZpY2F0aW9uT2JqZWN0RGVzdHJveWVkKE5vdGlmaWNhdGlvbiogbm90aWZpCiAgICAg bV9wcmVzZW50ZXItPm9iamVjdERlc3Ryb3llZChQYXNzUmVmUHRyPE5vdGlmaWNhdGlvbj4obm90 aWZpY2F0aW9uKSk7CiB9CiAKLU5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBOb3Rp ZmljYXRpb25QcmVzZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24oU2VjdXJpdHlPcmlnaW4qIG9y aWdpbikKK05vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBOb3RpZmljYXRpb25QcmVz ZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24oY29uc3QgS1VSTCYgc291cmNlVVJMKQogewotICAg IGludCByZXN1bHQgPSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKFdlYlNlY3VyaXR5T3Jp Z2luKG9yaWdpbikpOworICAgIGludCByZXN1bHQgPSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNz aW9uKHNvdXJjZVVSTCk7CiAKICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBjbGllbnRz IGFyZSB1cGRhdGVkIHRvIHVzZSB0aGUgYWJvdmUgc2lnbmF0dXJlLgogICAgIGlmIChyZXN1bHQg PT0gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uTm90QWxsb3dlZCkKLSAgICAgICAg cmVzdWx0ID0gbV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihLVVJMKEtVUkwoKSwgb3JpZ2lu LT50b1N0cmluZygpKSwgMCk7CisgICAgICAgIHJlc3VsdCA9IG1fcHJlc2VudGVyLT5jaGVja1Bl cm1pc3Npb24oc291cmNlVVJMLCAwKTsKIAogICAgIHJldHVybiBzdGF0aWNfY2FzdDxOb3RpZmlj YXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24+KHJlc3VsdCk7CiB9CmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuaCBiL1dlYktpdC9jaHJv bWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5oCmluZGV4IDRhZmU5ZGMuLjQ3OTUz OGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVy SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1w bC5oCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgc2hvdyhXZWJD b3JlOjpOb3RpZmljYXRpb24qIG9iamVjdCk7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbChXZWJD b3JlOjpOb3RpZmljYXRpb24qIG9iamVjdCk7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmaWNhdGlv bk9iamVjdERlc3Ryb3llZChXZWJDb3JlOjpOb3RpZmljYXRpb24qIG9iamVjdCk7Ci0gICAgdmly dHVhbCBXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gY2hlY2tQZXJt aXNzaW9uKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pOworICAgIHZpcnR1YWwgV2Vi Q29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihj b25zdCBXZWJDb3JlOjpLVVJMJiBzb3VyY2VVUkwpOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0 UGVybWlzc2lvbihXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBXVEY6OlBhc3NSZWZQ dHI8V2ViQ29yZTo6Vm9pZENhbGxiYWNrPiBjYWxsYmFjayk7CiAKIHByaXZhdGU6Cg== 51691 2010-03-25 16:47:48 -0700 2010-03-25 17:01:32 -0700 Patch bug-36625-20100325164747.patch text/plain 8865 rafaelw ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTMyMTQ3YS4uMjVkMDdjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMy0yNSAgUmFmYWVsIFdlaW5z dGVpbiAgPHJhZmFlbHdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OmNoZWNr UGVybWlzc2lvbigpIHRvIHRha2UgdGhlIHNvdXJjZSBmcmFtZXMgZnVsbCBLVVJMLAorICAgICAg ICByYXRoZXIgdGhhbiBpdHMgU2VjdXJpdHlPcmlnaW4uCisKKyAgICAgICAgKiBub3RpZmljYXRp b25zL05vdGlmaWNhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246Ok5v dGlmaWNhdGlvbik6CisgICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uQ2VudGVyOjpjaGVja1Blcm1pc3Np b24pOgorICAgICAgICAqIG5vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVyLmg6CisK IDIwMTAtMDMtMjUgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9u b3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90 aWZpY2F0aW9uLmNwcAppbmRleCA5NzYzZjdiLi40NTgyYzgzIDEwMDY0NAotLS0gYS9XZWJDb3Jl L25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmNwcApAQCAtNDksNyArNDksNyBAQCBOb3RpZmljYXRpb246Ok5vdGlm aWNhdGlvbihjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwgRQogICAgICwgbV9wcmVzZW50ZXIocHJvdmlkZXIpCiB7CiAgICAgQVNTRVJUKG1fcHJlc2Vu dGVyKTsKLSAgICBpZiAobV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihjb250ZXh0LT5zZWN1 cml0eU9yaWdpbigpKSAhPSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb25BbGxvd2Vk KSB7CisgICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCkp ICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKICAgICAgICAg ZWMgPSBTRUNVUklUWV9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02OSw3ICs2OSw3 IEBAIE5vdGlmaWNhdGlvbjo6Tm90aWZpY2F0aW9uKGNvbnN0IE5vdGlmaWNhdGlvbkNvbnRlbnRz JiBjb250ZW50cywgU2NyaXB0RXhlY3V0aW9uCiAgICAgLCBtX3ByZXNlbnRlcihwcm92aWRlcikK IHsKICAgICBBU1NFUlQobV9wcmVzZW50ZXIpOwotICAgIGlmIChtX3ByZXNlbnRlci0+Y2hlY2tQ ZXJtaXNzaW9uKGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCkpICE9IE5vdGlmaWNhdGlvblByZXNl bnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKKyAgICBpZiAobV9wcmVzZW50ZXItPmNoZWNrUGVy bWlzc2lvbihjb250ZXh0LT51cmwoKSkgIT0gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNz aW9uQWxsb3dlZCkgewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgcmV0dXJu OwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25D ZW50ZXIuY3BwIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRlci5jcHAK aW5kZXggMjA1YjlhOS4uODA4OWQ4NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9ub3RpZmljYXRpb25z L05vdGlmaWNhdGlvbkNlbnRlci5jcHAKKysrIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlm aWNhdGlvbkNlbnRlci5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgaW50IE5vdGlmaWNhdGlvbkNlbnRl cjo6Y2hlY2tQZXJtaXNzaW9uKCkKIHsKICAgICBpZiAoIXByZXNlbnRlcigpKQogICAgICAgICBy ZXR1cm4gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uRGVuaWVkOwotICAgIHJldHVy biBtX25vdGlmaWNhdGlvblByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKG1fc2NyaXB0RXhlY3V0 aW9uQ29udGV4dC0+c2VjdXJpdHlPcmlnaW4oKSk7CisgICAgcmV0dXJuIG1fbm90aWZpY2F0aW9u UHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT51cmwo KSk7CiB9CiAKIHZvaWQgTm90aWZpY2F0aW9uQ2VudGVyOjpyZXF1ZXN0UGVybWlzc2lvbihQYXNz UmVmUHRyPFZvaWRDYWxsYmFjaz4gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9XZWJDb3JlL25vdGlm aWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVyLmggYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMv Tm90aWZpY2F0aW9uUHJlc2VudGVyLmgKaW5kZXggOWFiZjhhOS4uMTkzZWIyYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oCisrKyBiL1dl YkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaApAQCAtNzIsNyArNzIs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVy bWlzc2lvbihTZWN1cml0eU9yaWdpbiosIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPikgPSAwOwog CiAgICAgICAgIC8vIENoZWNrcyB0aGUgY3VycmVudCBsZXZlbCBvZiBwZXJtaXNzaW9uLgotICAg ICAgICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2luKikg PSAwOworICAgICAgICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IEtV UkwmKSA9IDA7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5k ZXggZjhjMmU0NC4uNDhhNDZlNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAt MDMtMjUgIFJhZmFlbCBXZWluc3RlaW4gIDxyYWZhZWx3QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgTm90aWZpY2F0 aW9uUHJlc2VudGVyOjpjaGVja1Blcm1pc3Npb24oKSB0byB0YWtlIHRoZSBzb3VyY2UgZnJhbWVz IGZ1bGwgS1VSTCwKKyAgICAgICAgcmF0aGVyIHRoYW4gaXRzIFNlY3VyaXR5T3JpZ2luLgorCisg ICAgICAgICogcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRlci5oOgorICAgICAgICAoV2Vi S2l0OjpXZWJOb3RpZmljYXRpb25QcmVzZW50ZXI6OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAg ICogc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpO b3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24pOgorICAgICAgICAqIHNy Yy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmg6CisKIDIwMTAtMDMtMjUgIEpvY2hlbiBFaXNp bmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15 IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb3RpZmljYXRp b25QcmVzZW50ZXIuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJl c2VudGVyLmgKaW5kZXggNzNjM2I1Ni4uZmI2MzI2MiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaAorKysgYi9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRlci5oCkBAIC02Miw3ICs2Miw3IEBAIHB1 YmxpYzoKIAogICAgIC8vIENoZWNrcyB0aGUgcGVybWlzc2lvbiBsZXZlbCBmb3IgdGhlIGdpdmVu IG9yaWdpbi4KICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmVjb21lIGFic3RyYWN0IHdoZW4g dGhlIGJlbG93IGlzIHJlbW92ZWQuCi0gICAgdmlydHVhbCBQZXJtaXNzaW9uIGNoZWNrUGVybWlz c2lvbihjb25zdCBXZWJTZWN1cml0eU9yaWdpbiYgb3JpZ2luKQorICAgIHZpcnR1YWwgUGVybWlz c2lvbiBjaGVja1Blcm1pc3Npb24oY29uc3QgV2ViVVJMJiB1cmwpCiAgICAgewogICAgICAgICBy ZXR1cm4gUGVybWlzc2lvbk5vdEFsbG93ZWQ7CiAgICAgfTsKZGlmZiAtLWdpdCBhL1dlYktpdC9j aHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAgYi9XZWJLaXQvY2hyb21p dW0vc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwCmluZGV4IGQwYTdlMzkuLjFkYWY2 ODggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVy SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmNwcApAQCAtOTEsMTMgKzkxLDEzIEBAIHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVySW1w bDo6bm90aWZpY2F0aW9uT2JqZWN0RGVzdHJveWVkKE5vdGlmaWNhdGlvbiogbm90aWZpCiAgICAg bV9wcmVzZW50ZXItPm9iamVjdERlc3Ryb3llZChQYXNzUmVmUHRyPE5vdGlmaWNhdGlvbj4obm90 aWZpY2F0aW9uKSk7CiB9CiAKLU5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBOb3Rp ZmljYXRpb25QcmVzZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24oU2VjdXJpdHlPcmlnaW4qIG9y aWdpbikKK05vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBOb3RpZmljYXRpb25QcmVz ZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24oY29uc3QgS1VSTCYgc291cmNlVVJMKQogewotICAg IGludCByZXN1bHQgPSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKFdlYlNlY3VyaXR5T3Jp Z2luKG9yaWdpbikpOworICAgIGludCByZXN1bHQgPSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNz aW9uKHNvdXJjZVVSTCk7CiAKICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBjbGllbnRz IGFyZSB1cGRhdGVkIHRvIHVzZSB0aGUgYWJvdmUgc2lnbmF0dXJlLgogICAgIGlmIChyZXN1bHQg PT0gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uTm90QWxsb3dlZCkKLSAgICAgICAg cmVzdWx0ID0gbV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihLVVJMKEtVUkwoKSwgb3JpZ2lu LT50b1N0cmluZygpKSwgMCk7CisgICAgICAgIHJlc3VsdCA9IG1fcHJlc2VudGVyLT5jaGVja1Bl cm1pc3Npb24oc291cmNlVVJMLCAwKTsKIAogICAgIHJldHVybiBzdGF0aWNfY2FzdDxOb3RpZmlj YXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24+KHJlc3VsdCk7CiB9CmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuaCBiL1dlYktpdC9jaHJv bWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5oCmluZGV4IDRhZmU5ZGMuLjQ3OTUz OGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVy SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1w bC5oCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgc2hvdyhXZWJD b3JlOjpOb3RpZmljYXRpb24qIG9iamVjdCk7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbChXZWJD b3JlOjpOb3RpZmljYXRpb24qIG9iamVjdCk7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmaWNhdGlv bk9iamVjdERlc3Ryb3llZChXZWJDb3JlOjpOb3RpZmljYXRpb24qIG9iamVjdCk7Ci0gICAgdmly dHVhbCBXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gY2hlY2tQZXJt aXNzaW9uKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pOworICAgIHZpcnR1YWwgV2Vi Q29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihj b25zdCBXZWJDb3JlOjpLVVJMJiBzb3VyY2VVUkwpOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0 UGVybWlzc2lvbihXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBXVEY6OlBhc3NSZWZQ dHI8V2ViQ29yZTo6Vm9pZENhbGxiYWNrPiBjYWxsYmFjayk7CiAKIHByaXZhdGU6CmRpZmYgLS1n aXQgYS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDYz ODhiOGMuLmJiZGE1ZDAgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dl YktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMtMjUgIFJhZmFlbCBX ZWluc3RlaW4gIDxyYWZhZWx3QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgTm90aWZpY2F0aW9uUHJlc2VudGVyOjpj aGVja1Blcm1pc3Npb24oKSB0byB0YWtlIHRoZSBzb3VyY2UgZnJhbWVzIGZ1bGwgS1VSTCwKKyAg ICAgICAgcmF0aGVyIHRoYW4gaXRzIFNlY3VyaXR5T3JpZ2luLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5jcHA6CisgICAgICAgIChX ZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlOjpjaGVja1Blcm1pc3Npb24pOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuaDoKKwog MjAxMC0wMy0yNCAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgogCiAgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS83NzgwNzk4PiBNaXNzaW5nIHBsdWctaW5zIHNob3VsZCBiZSBy ZXByZXNlbnRlZCBieSB0ZXh0CmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuY3BwIGIvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlLmNwcAppbmRleCA0ZjgwZDEw Li4zZDZhMDQ0IDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRlc2t0 b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuY3BwCisrKyBiL1dlYktpdC93aW4vV2ViQ29yZVN1cHBv cnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5jcHAKQEAgLTE3NywxMCArMTc3LDEw IEBAIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBXZWJEZXNrdG9wTm90aWZpY2F0 aW9uc0RlbGVnYXRlOjpjaGVja1Blcm1pc3NpCiAgICAgcmV0dXJuIE5vdGlmaWNhdGlvblByZXNl bnRlcjo6UGVybWlzc2lvbk5vdEFsbG93ZWQ7CiB9CiAKLU5vdGlmaWNhdGlvblByZXNlbnRlcjo6 UGVybWlzc2lvbiBXZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlOjpjaGVja1Blcm1pc3Np b24oU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKK05vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlz c2lvbiBXZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlOjpjaGVja1Blcm1pc3Npb24oY29u c3QgS1VSTCYgdXJsKQogewogICAgIGludCBvdXQgPSAwOwotICAgIEJTdHJpbmcgb3JnKG9yaWdp bi0+dG9TdHJpbmcoKSk7CisgICAgQlN0cmluZyBvcmcoU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh1 cmwpLT50b1N0cmluZygpKTsKICAgICBpZiAoaGFzTm90aWZpY2F0aW9uRGVsZWdhdGUoKSkKICAg ICAgICAgbm90aWZpY2F0aW9uRGVsZWdhdGUoKS0+Y2hlY2tOb3RpZmljYXRpb25QZXJtaXNzaW9u KG9yZywgJm91dCk7CiAgICAgcmV0dXJuIChOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Np b24pIG91dDsKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRGVza3Rv cE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5oIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJE ZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlLmgKaW5kZXggYmRhYWY1Mi4uYWYxZjA5YSAxMDA2 NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0aW9u c0RlbGVnYXRlLmgKKysrIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEZXNrdG9wTm90 aWZpY2F0aW9uc0RlbGVnYXRlLmgKQEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBub3RpZmljYXRpb25PYmplY3REZXN0cm95ZWQoV2ViQ29yZTo6Tm90aWZpY2F0aW9u KiBvYmplY3QpOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVybWlzc2lvbihXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbiogb3JpZ2luLCBQYXNzUmVmUHRyPFdlYkNvcmU6OlZvaWRDYWxsYmFjaz4g Y2FsbGJhY2spOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyOjpQ ZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBLVVJMJiB1cmwsIERvY3VtZW50KiBkb2N1 bWVudCk7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1p c3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKiBvcmln aW4pOworICAgIHZpcnR1YWwgV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNz aW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBLVVJMJiB1cmwpOwogCiBwcml2YXRlOgogICAgIGJv b2wgaGFzTm90aWZpY2F0aW9uRGVsZWdhdGUoKTsK 51693 2010-03-25 17:01:36 -0700 2010-03-29 18:38:10 -0700 Patch bug-36625-20100325170134.patch text/plain 9171 rafaelw ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTMyMTQ3YS4uY2U2YTk4ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMy0yNSAgUmFmYWVsIFdlaW5z dGVpbiAgPHJhZmFlbHdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OmNoZWNr UGVybWlzc2lvbigpIHRvIHRha2UgdGhlIHNvdXJjZSBmcmFtZXMgZnVsbCBLVVJMLAorICAgICAg ICByYXRoZXIgdGhhbiBpdHMgU2VjdXJpdHlPcmlnaW4uIFRoaXMgd2lsbCBhaWQgY2hyb21pdW0g aW4gaGF2aW5nIG1vcmUgZmluZSBncmFpbmVkCisgICAgICAgIHBlcm1pc3Npb25zIHRvIGNvbnRy b2wgbm90aWZpY2F0aW9uIHNwYW0uCisKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246Ok5vdGlmaWNhdGlvbik6 CisgICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uQ2VudGVyOjpjaGVja1Blcm1pc3Npb24pOgorICAgICAg ICAqIG5vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVyLmg6CisKIDIwMTAtMDMtMjUg IEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25z L05vdGlmaWNhdGlvbi5jcHAgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNw cAppbmRleCA5NzYzZjdiLi40NTgyYzgzIDEwMDY0NAotLS0gYS9XZWJDb3JlL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmNwcAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0 aW9uLmNwcApAQCAtNDksNyArNDksNyBAQCBOb3RpZmljYXRpb246Ok5vdGlmaWNhdGlvbihjb25z dCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgRQogICAgICwg bV9wcmVzZW50ZXIocHJvdmlkZXIpCiB7CiAgICAgQVNTRVJUKG1fcHJlc2VudGVyKTsKLSAgICBp ZiAobV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihjb250ZXh0LT5zZWN1cml0eU9yaWdpbigp KSAhPSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb25BbGxvd2VkKSB7CisgICAgaWYg KG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCkpICE9IE5vdGlmaWNh dGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKICAgICAgICAgZWMgPSBTRUNVUklU WV9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02OSw3ICs2OSw3IEBAIE5vdGlmaWNh dGlvbjo6Tm90aWZpY2F0aW9uKGNvbnN0IE5vdGlmaWNhdGlvbkNvbnRlbnRzJiBjb250ZW50cywg U2NyaXB0RXhlY3V0aW9uCiAgICAgLCBtX3ByZXNlbnRlcihwcm92aWRlcikKIHsKICAgICBBU1NF UlQobV9wcmVzZW50ZXIpOwotICAgIGlmIChtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKGNv bnRleHQtPnNlY3VyaXR5T3JpZ2luKCkpICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlz c2lvbkFsbG93ZWQpIHsKKyAgICBpZiAobV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihjb250 ZXh0LT51cmwoKSkgIT0gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uQWxsb3dlZCkg ewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuY3BwIGIv V2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRlci5jcHAKaW5kZXggMjA1Yjlh OS4uODA4OWQ4NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlv bkNlbnRlci5jcHAKKysrIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRl ci5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgaW50IE5vdGlmaWNhdGlvbkNlbnRlcjo6Y2hlY2tQZXJt aXNzaW9uKCkKIHsKICAgICBpZiAoIXByZXNlbnRlcigpKQogICAgICAgICByZXR1cm4gTm90aWZp Y2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uRGVuaWVkOwotICAgIHJldHVybiBtX25vdGlmaWNh dGlvblByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+ c2VjdXJpdHlPcmlnaW4oKSk7CisgICAgcmV0dXJuIG1fbm90aWZpY2F0aW9uUHJlc2VudGVyLT5j aGVja1Blcm1pc3Npb24obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT51cmwoKSk7CiB9CiAKIHZv aWQgTm90aWZpY2F0aW9uQ2VudGVyOjpyZXF1ZXN0UGVybWlzc2lvbihQYXNzUmVmUHRyPFZvaWRD YWxsYmFjaz4gY2FsbGJhY2spCmRpZmYgLS1naXQgYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90 aWZpY2F0aW9uUHJlc2VudGVyLmggYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9u UHJlc2VudGVyLmgKaW5kZXggOWFiZjhhOS4uMTkzZWIyYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9u b3RpZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oCisrKyBiL1dlYkNvcmUvbm90aWZp Y2F0aW9ucy9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaApAQCAtNzIsNyArNzIsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVybWlzc2lvbihTZWN1 cml0eU9yaWdpbiosIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPikgPSAwOwogCiAgICAgICAgIC8v IENoZWNrcyB0aGUgY3VycmVudCBsZXZlbCBvZiBwZXJtaXNzaW9uLgotICAgICAgICB2aXJ0dWFs IFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2luKikgPSAwOworICAgICAg ICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IEtVUkwmKSA9IDA7CiAg ICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZjhjMmU0NC4u OTRkMzg1MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMtMjUgIFJhZmFl bCBXZWluc3RlaW4gIDxyYWZhZWx3QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgTm90aWZpY2F0aW9uUHJlc2VudGVy OjpjaGVja1Blcm1pc3Npb24oKSB0byB0YWtlIHRoZSBzb3VyY2UgZnJhbWVzIGZ1bGwgS1VSTCwK KyAgICAgICAgcmF0aGVyIHRoYW4gaXRzIFNlY3VyaXR5T3JpZ2luLiBUaGlzIHdpbGwgYWlkIGNo cm9taXVtIGluIGhhdmluZyBtb3JlIGZpbmUgZ3JhaW5lZAorICAgICAgICBwZXJtaXNzaW9ucyB0 byBjb250cm9sIG5vdGlmaWNhdGlvbiBzcGFtLgorCisgICAgICAgICogcHVibGljL1dlYk5vdGlm aWNhdGlvblByZXNlbnRlci5oOgorICAgICAgICAoV2ViS2l0OjpXZWJOb3RpZmljYXRpb25QcmVz ZW50ZXI6OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAgICogc3JjL05vdGlmaWNhdGlvblByZXNl bnRlckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBs OjpjaGVja1Blcm1pc3Npb24pOgorICAgICAgICAqIHNyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmg6CisKIDIwMTAtMDMtMjUgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaCBiL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyLmgKaW5kZXggNzNjM2I1Ni4u ZmI2MzI2MiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb3RpZmljYXRp b25QcmVzZW50ZXIuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk5vdGlmaWNhdGlv blByZXNlbnRlci5oCkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKIAogICAgIC8vIENoZWNrcyB0 aGUgcGVybWlzc2lvbiBsZXZlbCBmb3IgdGhlIGdpdmVuIG9yaWdpbi4KICAgICAvLyBGSVhNRTog VGhpcyBzaG91bGQgYmVjb21lIGFic3RyYWN0IHdoZW4gdGhlIGJlbG93IGlzIHJlbW92ZWQuCi0g ICAgdmlydHVhbCBQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBXZWJTZWN1cml0eU9y aWdpbiYgb3JpZ2luKQorICAgIHZpcnR1YWwgUGVybWlzc2lvbiBjaGVja1Blcm1pc3Npb24oY29u c3QgV2ViVVJMJiB1cmwpCiAgICAgewogICAgICAgICByZXR1cm4gUGVybWlzc2lvbk5vdEFsbG93 ZWQ7CiAgICAgfTsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9u UHJlc2VudGVySW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL05vdGlmaWNhdGlvblByZXNl bnRlckltcGwuY3BwCmluZGV4IGQwYTdlMzkuLjFkYWY2ODggMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAKKysrIGIvV2ViS2l0L2No cm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmNwcApAQCAtOTEsMTMgKzkxLDEz IEBAIHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6bm90aWZpY2F0aW9uT2JqZWN0RGVz dHJveWVkKE5vdGlmaWNhdGlvbiogbm90aWZpCiAgICAgbV9wcmVzZW50ZXItPm9iamVjdERlc3Ry b3llZChQYXNzUmVmUHRyPE5vdGlmaWNhdGlvbj4obm90aWZpY2F0aW9uKSk7CiB9CiAKLU5vdGlm aWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpj aGVja1Blcm1pc3Npb24oU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKK05vdGlmaWNhdGlvblByZXNl bnRlcjo6UGVybWlzc2lvbiBOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Np b24oY29uc3QgS1VSTCYgc291cmNlVVJMKQogewotICAgIGludCByZXN1bHQgPSBtX3ByZXNlbnRl ci0+Y2hlY2tQZXJtaXNzaW9uKFdlYlNlY3VyaXR5T3JpZ2luKG9yaWdpbikpOworICAgIGludCBy ZXN1bHQgPSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKHNvdXJjZVVSTCk7CiAKICAgICAv LyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBjbGllbnRzIGFyZSB1cGRhdGVkIHRvIHVzZSB0aGUg YWJvdmUgc2lnbmF0dXJlLgogICAgIGlmIChyZXN1bHQgPT0gTm90aWZpY2F0aW9uUHJlc2VudGVy OjpQZXJtaXNzaW9uTm90QWxsb3dlZCkKLSAgICAgICAgcmVzdWx0ID0gbV9wcmVzZW50ZXItPmNo ZWNrUGVybWlzc2lvbihLVVJMKEtVUkwoKSwgb3JpZ2luLT50b1N0cmluZygpKSwgMCk7CisgICAg ICAgIHJlc3VsdCA9IG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oc291cmNlVVJMLCAwKTsK IAogICAgIHJldHVybiBzdGF0aWNfY2FzdDxOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Np b24+KHJlc3VsdCk7CiB9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL05vdGlmaWNh dGlvblByZXNlbnRlckltcGwuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJl c2VudGVySW1wbC5oCmluZGV4IDRhZmU5ZGMuLjQ3OTUzOGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5oCisrKyBiL1dlYktpdC9jaHJv bWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5oCkBAIC01NCw3ICs1NCw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgc2hvdyhXZWJDb3JlOjpOb3RpZmljYXRpb24qIG9iamVj dCk7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbChXZWJDb3JlOjpOb3RpZmljYXRpb24qIG9iamVj dCk7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmaWNhdGlvbk9iamVjdERlc3Ryb3llZChXZWJDb3Jl OjpOb3RpZmljYXRpb24qIG9iamVjdCk7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpOb3RpZmljYXRp b25QcmVzZW50ZXI6OlBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKFdlYkNvcmU6OlNlY3VyaXR5 T3JpZ2luKiBvcmlnaW4pOworICAgIHZpcnR1YWwgV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2Vu dGVyOjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBXZWJDb3JlOjpLVVJMJiBzb3Vy Y2VVUkwpOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVybWlzc2lvbihXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbiogb3JpZ2luLCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6Vm9pZENhbGxiYWNr PiBjYWxsYmFjayk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL0NoYW5nZUxv ZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDYzODhiOGMuLmQxZWZlOWIgMTAwNjQ0Ci0t LSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDMtMjUgIFJhZmFlbCBXZWluc3RlaW4gIDxyYWZhZWx3QGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDaGFuZ2UgTm90aWZpY2F0aW9uUHJlc2VudGVyOjpjaGVja1Blcm1pc3Npb24oKSB0byB0YWtl IHRoZSBzb3VyY2UgZnJhbWVzIGZ1bGwgS1VSTCwKKyAgICAgICAgcmF0aGVyIHRoYW4gaXRzIFNl Y3VyaXR5T3JpZ2luLiBUaGlzIHdpbGwgYWlkIGNocm9taXVtIGluIGhhdmluZyBtb3JlIGZpbmUg Z3JhaW5lZAorICAgICAgICBwZXJtaXNzaW9ucyB0byBjb250cm9sIG5vdGlmaWNhdGlvbiBzcGFt LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxl Z2F0ZS5jcHA6CisgICAgICAgIChXZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlOjpjaGVj a1Blcm1pc3Npb24pOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmlj YXRpb25zRGVsZWdhdGUuaDoKKwogMjAxMC0wMy0yNCAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1 dHRAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzgwNzk4PiBNaXNzaW5n IHBsdWctaW5zIHNob3VsZCBiZSByZXByZXNlbnRlZCBieSB0ZXh0CmRpZmYgLS1naXQgYS9XZWJL aXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuY3Bw IGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVn YXRlLmNwcAppbmRleCA0ZjgwZDEwLi4zZDZhMDQ0IDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuY3BwCisrKyBiL1dl YktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5j cHAKQEAgLTE3NywxMCArMTc3LDEwIEBAIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lv biBXZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlOjpjaGVja1Blcm1pc3NpCiAgICAgcmV0 dXJuIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbk5vdEFsbG93ZWQ7CiB9CiAKLU5v dGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBXZWJEZXNrdG9wTm90aWZpY2F0aW9uc0Rl bGVnYXRlOjpjaGVja1Blcm1pc3Npb24oU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKK05vdGlmaWNh dGlvblByZXNlbnRlcjo6UGVybWlzc2lvbiBXZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRl OjpjaGVja1Blcm1pc3Npb24oY29uc3QgS1VSTCYgdXJsKQogewogICAgIGludCBvdXQgPSAwOwot ICAgIEJTdHJpbmcgb3JnKG9yaWdpbi0+dG9TdHJpbmcoKSk7CisgICAgQlN0cmluZyBvcmcoU2Vj dXJpdHlPcmlnaW46OmNyZWF0ZSh1cmwpLT50b1N0cmluZygpKTsKICAgICBpZiAoaGFzTm90aWZp Y2F0aW9uRGVsZWdhdGUoKSkKICAgICAgICAgbm90aWZpY2F0aW9uRGVsZWdhdGUoKS0+Y2hlY2tO b3RpZmljYXRpb25QZXJtaXNzaW9uKG9yZywgJm91dCk7CiAgICAgcmV0dXJuIChOb3RpZmljYXRp b25QcmVzZW50ZXI6OlBlcm1pc3Npb24pIG91dDsKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2Vi Q29yZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5oIGIvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlLmgKaW5kZXgg YmRhYWY1Mi4uYWYxZjA5YSAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlLmgKKysrIGIvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlLmgKQEAgLTUxLDcgKzUxLDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBub3RpZmljYXRpb25PYmplY3REZXN0cm95ZWQo V2ViQ29yZTo6Tm90aWZpY2F0aW9uKiBvYmplY3QpOwogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0 UGVybWlzc2lvbihXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBQYXNzUmVmUHRyPFdl YkNvcmU6OlZvaWRDYWxsYmFjaz4gY2FsbGJhY2spOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Tm90 aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBLVVJM JiB1cmwsIERvY3VtZW50KiBkb2N1bWVudCk7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpOb3RpZmlj YXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pOworICAgIHZpcnR1YWwgV2ViQ29yZTo6Tm90aWZpY2F0 aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBLVVJMJiB1cmwp OwogCiBwcml2YXRlOgogICAgIGJvb2wgaGFzTm90aWZpY2F0aW9uRGVsZWdhdGUoKTsK