197439 2019-04-30 14:01:00 -0700 RemoteInspector::updateAutomaticInspectionCandidate should have a default implementation. 2019-05-02 15:35:33 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 197029 1 basuke basuke basuke commit-queue don.olmstead ews-watchlist hi joepeck keith_miller mark.lam mcatanzaro msaboff ross.kirsling saam oldest_to_newest 1531693 0 basuke 2019-04-30 14:01:00 -0700 The required method RemoteInspector::updateAutomaticInspectionCandidate() was not implemented. 1531696 1 368608 basuke 2019-04-30 14:06:25 -0700 Created attachment 368608 PATCH 1531700 2 368611 basuke 2019-04-30 14:08:19 -0700 Created attachment 368611 PATCH 1531738 3 ross.kirsling 2019-04-30 15:47:26 -0700 Looks like this is a copy-paste of the Glib implementation -- unless we have an expectation for the two to diverge, perhaps it should be moved to a common location instead? 1531751 4 basuke 2019-04-30 16:17:44 -0700 (In reply to Ross Kirsling from comment #3) > Looks like this is a copy-paste of the Glib implementation -- unless we have > an expectation for the two to diverge, perhaps it should be moved to a > common location instead? Humm, good point. I didn't think about that before because it was separated before we've start adding our port. It seems almost neutral for all port. I'll try moving it in shared implementation. 1531766 5 368628 basuke 2019-04-30 16:39:13 -0700 Created attachment 368628 PATCH 1531806 6 368635 basuke 2019-04-30 17:41:15 -0700 Created attachment 368635 PATCH 1531807 7 368635 basuke 2019-04-30 17:42:27 -0700 Comment on attachment 368635 PATCH At this moment, this is a good balance to share code. We'll do more when we implement automatic inspection. 1531812 8 don.olmstead 2019-04-30 17:48:41 -0700 (In reply to Basuke Suzuki from comment #7) > Comment on attachment 368635 [details] > PATCH > > At this moment, this is a good balance to share code. We'll do more when we > implement automatic inspection. I'd probably change the bug name at this time since this is touching more than playstation. 1532009 9 368635 don.olmstead 2019-05-01 12:26:36 -0700 Comment on attachment 368635 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=368635&action=review > Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp:107 > + if (updateTargetInternal()) This should have `target` passed in then it should build. 1532051 10 368703 ross.kirsling 2019-05-01 13:52:32 -0700 Created attachment 368703 Patch 1532107 11 368721 ross.kirsling 2019-05-01 15:26:59 -0700 Created attachment 368721 Patch 1532116 12 368721 hi 2019-05-01 15:47:35 -0700 Comment on attachment 368721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368721&action=review r=me > Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp:113 > +bool RemoteInspector::updateTargetInternal(RemoteControllableTarget* target) This is an odd name. How about `updateListingForTarget` or `updateTargetMap`? > Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp:-111 > - { NIT: I realize this block is unnecessary, but I wouldn't change it for the sake of keeping the diff cleaner :P 1532132 13 ross.kirsling 2019-05-01 16:25:43 -0700 (In reply to Devin Rousso from comment #12) > Comment on attachment 368721 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=368721&action=review > > r=me > > > Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp:113 > > +bool RemoteInspector::updateTargetInternal(RemoteControllableTarget* target) > > This is an odd name. How about `updateListingForTarget` or > `updateTargetMap`? I almost changed this to `updateTargetListings` but it turns out that `updateTargetListing` is already a method! That one literally just updates m_targetListingMap, whereas this one updates m_targetMap then sets OR clears m_targetListingMap. I suppose `updateTargetMap` could be clearer if that were taken to imply an update to the listing too -- do you think that's the case? > > Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp:-111 > > - { > > NIT: I realize this block is unnecessary, but I wouldn't change it for the > sake of keeping the diff cleaner :P I would have left it, but since the Glib version doesn't have it, I thought it'd be okay to remove it while merging implementations, haha. 1532146 14 368737 ross.kirsling 2019-05-01 17:03:05 -0700 Created attachment 368737 Patch for landing 1532153 15 368737 commit-queue 2019-05-01 17:25:52 -0700 Comment on attachment 368737 Patch for landing Clearing flags on attachment: 368737 Committed r244861: <https://trac.webkit.org/changeset/244861> 1532154 16 commit-queue 2019-05-01 17:25:53 -0700 All reviewed patches have been landed. Closing bug. 1532484 17 webkit-bug-importer 2019-05-02 15:35:33 -0700 <rdar://problem/50424864> 368608 2019-04-30 14:06:25 -0700 2019-04-30 14:08:19 -0700 PATCH 197439.diff text/plain 2190 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDM4Y2NhZTJiOTZlLi4zYjVlYzllNWVkZCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDQtMzAgIEJhc3Vr ZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtQbGF5U3RhdGlv bl0gdGFyZ2V0TGlzdGluZ01hcCBpcyBub3QgdXBkYXRlIHdoZW4gUmVtb3RlSW5zcGVjdG9yIGhh cyBzdGFydGVkIGFmdGVyIHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdoZW4gUmVtb3RlSW5zcGVjdG9yIHN0YXJ0cyBhZnRlciB0YXJnZXRz LCB0aGlzIG1ldGhvZCBpcyBjYWxsZWQgdG8gdXBkYXRlIHRhcmdldExpc3RpbmdNYXAuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJbnNwZWN0b3JTb2NrZXQuY3Bw OgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0lu c3BlY3Rpb25DYW5kaWRhdGUpOgorCiAyMDE5LTA0LTI5ICBZdXN1a2UgU3V6dWtpICA8eXN1enVr aUBhcHBsZS5jb20+CiAKICAgICAgICAgSklUU3R1YlJvdXRpbmVTZXQgd2FzdGVzIDE4MEtCIG9m IEhhc2hUYWJsZSBjYXBhY2l0eSBvbiBjYW4uY29tCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9zb2NrZXQvUmVtb3RlSW5zcGVjdG9yU29ja2V0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJ bnNwZWN0b3JTb2NrZXQuY3BwCmluZGV4IGI0MzFkZjBhN2Y0Li5jOTM3NDBiNzFhMSAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90 ZUluc3BlY3RvclNvY2tldC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKQEAgLTE4NCw4ICsxODQs MjYgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwog fQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KikKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRh dGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKFJlbW90ZUluc3BlY3Rpb25UYXJnZXQqIHRh cmdldCkKIHsKKyAgICBMb2NrSG9sZGVyIGxvY2sobV9tdXRleCk7CisKKyAgICBBU1NFUlQodGFy Z2V0KTsKKyAgICB1bnNpZ25lZCB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJZGVu dGlmaWVyKCk7CisgICAgaWYgKCF0YXJnZXRJZGVudGlmaWVyKQorICAgICAgICByZXR1cm47CisK KyAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVudGlmaWVyLCB0YXJn ZXQpOworICAgIEFTU0VSVF9VTlVTRUQocmVzdWx0LCAhcmVzdWx0LmlzTmV3RW50cnkpOworCisg ICAgLy8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBhbGxvd2VkIHJlbW90ZSBjb250cm9sLCB0aGVu IHRoZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4KKyAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBu byBpZGVudGlmaWVyIHJlbW92ZSB0aGUgb2xkIGxpc3RpbmcuCisgICAgaWYgKGF1dG8gdGFyZ2V0 TGlzdGluZyA9IGxpc3RpbmdGb3JUYXJnZXQoKnRhcmdldCkpCisgICAgICAgIG1fdGFyZ2V0TGlz dGluZ01hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0TGlzdGluZyk7CisgICAgZWxzZQor ICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAucmVtb3ZlKHRhcmdldElkZW50aWZpZXIpOworICAg IC8vIEZJWE1FOiBJbXBsZW1lbnQgYXV0b21hdGljIGluc3BlY3Rpb24uCisgICAgcHVzaExpc3Rp bmdzU29vbigpOwogfQogCiB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6c2VuZEF1dG9tYXRpY0luc3Bl Y3Rpb25DYW5kaWRhdGVNZXNzYWdlKCkK 368611 2019-04-30 14:08:19 -0700 2019-04-30 16:39:13 -0700 PATCH 197439.diff text/plain 2186 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDM4Y2NhZTJiOTZlLi4zYjVlYzllNWVkZCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDQtMzAgIEJhc3Vr ZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtQbGF5U3RhdGlv bl0gdGFyZ2V0TGlzdGluZ01hcCBpcyBub3QgdXBkYXRlIHdoZW4gUmVtb3RlSW5zcGVjdG9yIGhh cyBzdGFydGVkIGFmdGVyIHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdoZW4gUmVtb3RlSW5zcGVjdG9yIHN0YXJ0cyBhZnRlciB0YXJnZXRz LCB0aGlzIG1ldGhvZCBpcyBjYWxsZWQgdG8gdXBkYXRlIHRhcmdldExpc3RpbmdNYXAuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJbnNwZWN0b3JTb2NrZXQuY3Bw OgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0lu c3BlY3Rpb25DYW5kaWRhdGUpOgorCiAyMDE5LTA0LTI5ICBZdXN1a2UgU3V6dWtpICA8eXN1enVr aUBhcHBsZS5jb20+CiAKICAgICAgICAgSklUU3R1YlJvdXRpbmVTZXQgd2FzdGVzIDE4MEtCIG9m IEhhc2hUYWJsZSBjYXBhY2l0eSBvbiBjYW4uY29tCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9zb2NrZXQvUmVtb3RlSW5zcGVjdG9yU29ja2V0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJ bnNwZWN0b3JTb2NrZXQuY3BwCmluZGV4IGI0MzFkZjBhN2Y0Li5lOGY0OTJhMDlkMCAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90 ZUluc3BlY3RvclNvY2tldC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKQEAgLTE4NCw4ICsxODQs MjYgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwog fQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KikKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRh dGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKFJlbW90ZUluc3BlY3Rpb25UYXJnZXQqIHRh cmdldCkKIHsKKyAgICBMb2NrSG9sZGVyIGxvY2sobV9tdXRleCk7CisKKyAgICBBU1NFUlQodGFy Z2V0KTsKKyAgICBhdXRvIHRhcmdldElkZW50aWZpZXIgPSB0YXJnZXQtPnRhcmdldElkZW50aWZp ZXIoKTsKKyAgICBpZiAoIXRhcmdldElkZW50aWZpZXIpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8gcmVzdWx0ID0gbV90YXJnZXRNYXAuc2V0KHRhcmdldElkZW50aWZpZXIsIHRhcmdldCk7 CisgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsICFyZXN1bHQuaXNOZXdFbnRyeSk7CisKKyAgICAv LyBJZiB0aGUgdGFyZ2V0IGhhcyBqdXN0IGFsbG93ZWQgcmVtb3RlIGNvbnRyb2wsIHRoZW4gdGhl IGxpc3Rpbmcgd29uJ3QgZXhpc3QgeWV0LgorICAgIC8vIElmIHRoZSB0YXJnZXQgaGFzIG5vIGlk ZW50aWZpZXIgcmVtb3ZlIHRoZSBvbGQgbGlzdGluZy4KKyAgICBpZiAoYXV0byB0YXJnZXRMaXN0 aW5nID0gbGlzdGluZ0ZvclRhcmdldCgqdGFyZ2V0KSkKKyAgICAgICAgbV90YXJnZXRMaXN0aW5n TWFwLnNldCh0YXJnZXRJZGVudGlmaWVyLCB0YXJnZXRMaXN0aW5nKTsKKyAgICBlbHNlCisgICAg ICAgIG1fdGFyZ2V0TGlzdGluZ01hcC5yZW1vdmUodGFyZ2V0SWRlbnRpZmllcik7CisgICAgLy8g RklYTUU6IEltcGxlbWVudCBhdXRvbWF0aWMgaW5zcGVjdGlvbi4KKyAgICBwdXNoTGlzdGluZ3NT b29uKCk7CiB9CiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpzZW5kQXV0b21hdGljSW5zcGVjdGlv bkNhbmRpZGF0ZU1lc3NhZ2UoKQo= 368628 2019-04-30 16:39:13 -0700 2019-04-30 17:41:15 -0700 PATCH 197439.diff text/plain 10651 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDM4Y2NhZTJiOTZlLi5jN2IyZWU3Y2Y5NCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDQtMzAgIEJhc3Vr ZSBTdXp1a2kgIDxCYXN1a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtQbGF5U3RhdGlv bl0gdGFyZ2V0TGlzdGluZ01hcCBpcyBub3QgdXBkYXRlIHdoZW4gUmVtb3RlSW5zcGVjdG9yIGhh cyBzdGFydGVkIGFmdGVyIHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdoZW4gUmVtb3RlSW5zcGVjdG9yIHN0YXJ0cyBhZnRlciB0YXJnZXRz LCB0aGlzIG1ldGhvZCBpcyBjYWxsZWQgdG8gdXBkYXRlIHRhcmdldExpc3RpbmdNYXAuCisgICAg ICAgIEFsbCBpbXBsZW1lbnRhdGlvbiBkbyBhbG1vc3QgaWRlbnRpY2FsLiBNb3ZlIGl0IHRvIHNo YXJlZCBpbXBsZW1lbnRhdGlvbiBmaWxlLgorCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3IuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6 OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGUpOgorICAgICAgICAqIGluc3BlY3Rv ci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW06CisgICAgICAgIChJbnNwZWN0 b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZSk6 IE1vdmVkIHRvIFJlbW90ZUluc3BlY3Rvci5jcHAuCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90 ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1v dGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGUpOiBEZWxldGVk LgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tl dC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21h dGljSW5zcGVjdGlvbkNhbmRpZGF0ZSk6IERlbGV0ZWQuCisKIDIwMTktMDQtMjkgIFl1c3VrZSBT dXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBKSVRTdHViUm91dGluZVNldCB3 YXN0ZXMgMTgwS0Igb2YgSGFzaFRhYmxlIGNhcGFjaXR5IG9uIGNhbi5jb20KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3IuY3BwCmluZGV4IDlhNmE5NmYyOTA2Li5jZjhiNWQ5NzhkYyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3Iu Y3BwCkBAIC0yNDAsNiArMjQwLDgwIEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVIYXNB Y3RpdmVEZWJ1Z1Nlc3Npb24oKQogICAgIC8vIExlZ2FjeSBpT1MgV2ViS2l0IDEgaGFkIGEgbm90 aWZpY2F0aW9uLiBUaGlzIHdpbGwgbmVlZCB0byBiZSBzbWFydGVyIHdpdGggV2ViS2l0Mi4KIH0K IAordm9pZCBSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRh dGUoUmVtb3RlSW5zcGVjdGlvblRhcmdldCogdGFyZ2V0KQoreworICAgIEFTU0VSVF9BUkcodGFy Z2V0LCB0YXJnZXQpOworICAgIHsKKyAgICAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOwor CisgICAgICAgIGF1dG8gdGFyZ2V0SWRlbnRpZmllciA9IHRhcmdldC0+dGFyZ2V0SWRlbnRpZmll cigpOworICAgICAgICBpZiAoIXRhcmdldElkZW50aWZpZXIpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgYXV0byByZXN1bHQgPSBtX3RhcmdldE1hcC5zZXQodGFyZ2V0SWRlbnRpZmll ciwgdGFyZ2V0KTsKKyAgICAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsICFyZXN1bHQuaXNOZXdF bnRyeSk7CisKKyAgICAgICAgLy8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBhbGxvd2VkIHJlbW90 ZSBjb250cm9sLCB0aGVuIHRoZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4KKyAgICAgICAgLy8g SWYgdGhlIHRhcmdldCBoYXMgbm8gaWRlbnRpZmllciByZW1vdmUgdGhlIG9sZCBsaXN0aW5nLgor ICAgICAgICBpZiAoYXV0byB0YXJnZXRMaXN0aW5nID0gbGlzdGluZ0ZvclRhcmdldCgqdGFyZ2V0 KSkKKyAgICAgICAgICAgIG1fdGFyZ2V0TGlzdGluZ01hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwg dGFyZ2V0TGlzdGluZyk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fdGFyZ2V0TGlzdGlu Z01hcC5yZW1vdmUodGFyZ2V0SWRlbnRpZmllcik7CisKKyNpZiBVU0UoR0xJQikgfHwgUExBVEZP Uk0oUExBWVNUQVRJT04pCisgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgYXV0b21hdGljIGlu c3BlY3Rpb24uCisgICAgICAgIHB1c2hMaXN0aW5nc1Nvb24oKTsKKyNlbHNlCisgICAgICAgIC8v IERvbid0IGFsbG93IGF1dG9tYXRpYyBpbnNwZWN0aW9uIHVubGVzcyBpdCBpcyBhbGxvd2VkIG9y IHdlIGFyZSBzdG9wcGVkLgorICAgICAgICBpZiAoIW1fYXV0b21hdGljSW5zcGVjdGlvbkVuYWJs ZWQgfHwgIW1fZW5hYmxlZCkgeworICAgICAgICAgICAgcHVzaExpc3RpbmdzU29vbigpOworICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgLy8gRklYTUU6IFdlIHNob3Vs ZCBoYW5kbGUgbXVsdGlwbGUgZGVidWdnYWJsZXMgdHJ5aW5nIHRvIHBhdXNlIGF0IHRoZSBzYW1l IHRpbWUgb24gZGlmZmVyZW50IHRocmVhZHMuCisgICAgICAgIC8vIFRvIG1ha2UgdGhpcyB3b3Jr IHdlIHdpbGwgbmVlZCB0byBjaGFuZ2UgbV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFy Z2V0SWRlbnRpZmllciB0byBiZSBhIHBlci10aHJlYWQgdmFsdWUuCisgICAgICAgIC8vIE11bHRp cGxlIGF0dGVtcHRzIG9uIHRoZSBzYW1lIHRocmVhZCBzaG91bGQgbm90IGJlIHBvc3NpYmxlIGJl Y2F1c2Ugb3VyIG5lc3RlZCBydW4gbG9vcCBpcyBpbiBhIHNwZWNpYWwgUldJIG1vZGUuCisgICAg ICAgIGlmIChtX2F1dG9tYXRpY0luc3BlY3Rpb25QYXVzZWQpIHsKKyAgICAgICAgICAgIExPR19F UlJPUigiU2tpcHBpbmcgQXV0b21hdGljIEluc3BlY3Rpb24gQ2FuZGlkYXRlIHdpdGggcGFnZUlk KCV1KSBiZWNhdXNlIHdlIGFyZSBhbHJlYWR5IHBhdXNlZCB3YWl0aW5nIGZvciBwYWdlSWQoJXUp IiwgdGFyZ2V0SWRlbnRpZmllciwgbV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0 SWRlbnRpZmllcik7CisgICAgICAgICAgICBwdXNoTGlzdGluZ3NTb29uKCk7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBtX2F1dG9tYXRpY0luc3BlY3Rpb25QYXVz ZWQgPSB0cnVlOworICAgICAgICBtX2F1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGVUYXJnZXRJ ZGVudGlmaWVyID0gdGFyZ2V0SWRlbnRpZmllcjsKKworICAgICAgICAvLyBJZiB3ZSBhcmUgcGF1 c2luZyBiZWZvcmUgd2UgaGF2ZSBjb25uZWN0ZWQgdG8gd2ViaW5zcGVjdG9yZCB0aGUgY2FuZGlk YXRlIG1lc3NhZ2Ugd2lsbCBiZSBzZW50IGFzIHNvb24gYXMgdGhlIGNvbm5lY3Rpb24gaXMgZXN0 YWJsaXNoZWQuCisgICAgICAgIGlmIChtX3JlbGF5Q29ubmVjdGlvbikgeworICAgICAgICAgICAg cHVzaExpc3RpbmdzTm93KCk7CisgICAgICAgICAgICBzZW5kQXV0b21hdGljSW5zcGVjdGlvbkNh bmRpZGF0ZU1lc3NhZ2UoKTsKKyAgICAgICAgfQorCisgICAgICAgIC8vIEluIGNhc2UgZGVidWdn ZXJzIGZhaWwgdG8gcmVzcG9uZCwgb3Igd2UgY2Fubm90IGNvbm5lY3QgdG8gd2ViaW5zcGVjdG9y ZCwgYXV0b21hdGljYWxseSBjb250aW51ZSBhZnRlciBhIHNob3J0IHBlcmlvZCBvZiB0aW1lLgor I2lmIFBMQVRGT1JNKFdBVENIT1MpCisgICAgICAgIGludDY0X3QgZGVidWdnZXJUaW1lb3V0RGVs YXkgPSA1OworI2Vsc2UKKyAgICAgICAgaW50NjRfdCBkZWJ1Z2dlclRpbWVvdXREZWxheSA9IDE7 CisjZW5kaWYKKyAgICAgICAgZGlzcGF0Y2hfYWZ0ZXIoZGlzcGF0Y2hfdGltZShESVNQQVRDSF9U SU1FX05PVywgZGVidWdnZXJUaW1lb3V0RGVsYXkgKiBOU0VDX1BFUl9TRUMpLCBkaXNwYXRjaF9n ZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RFRkFVTFQsIDApLCBeewor ICAgICAgICAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOworICAgICAgICAgICAgaWYgKG1f YXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZVRhcmdldElkZW50aWZpZXIgPT0gdGFyZ2V0SWRl bnRpZmllcikgeworICAgICAgICAgICAgICAgIExPR19FUlJPUigiU2tpcHBpbmcgQXV0b21hdGlj IEluc3BlY3Rpb24gQ2FuZGlkYXRlIHdpdGggcGFnZUlkKCV1KSBiZWNhdXNlIHdlIGZhaWxlZCB0 byByZWNlaXZlIGEgcmVzcG9uc2UgaW4gdGltZS4iLCBtX2F1dG9tYXRpY0luc3BlY3Rpb25DYW5k aWRhdGVUYXJnZXRJZGVudGlmaWVyKTsKKyAgICAgICAgICAgICAgICBtX2F1dG9tYXRpY0luc3Bl Y3Rpb25QYXVzZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSk7CisjZW5kaWYK KyAgICB9CisKKyAgICB0YXJnZXQtPnBhdXNlV2FpdGluZ0ZvckF1dG9tYXRpY0luc3BlY3Rpb24o KTsKKworICAgIHsKKyAgICAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOworCisgICAgICAg IEFTU0VSVChtX2F1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGVUYXJnZXRJZGVudGlmaWVyKTsK KyAgICAgICAgbV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0SWRlbnRpZmllciA9 IDA7CisgICAgfQorfQorCiBSZW1vdGVJbnNwZWN0b3I6OkNsaWVudDo6fkNsaWVudCgpCiB7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2Nv YS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCmluZGV4IDViZWYyMWNiYjM5 Li44YjY3MTg3ZjZiYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0KKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0K QEAgLTExNiw3NSArMTE2LDYgQEAgUmVtb3RlSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3IoKQog ewogfQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNh bmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KiB0YXJnZXQpCi17Ci0gICAgQVNTRVJUX0FS Ryh0YXJnZXQsIHRhcmdldCk7Ci0gICAgewotICAgICAgICBMb2NrSG9sZGVyIGxvY2sobV9tdXRl eCk7Ci0KLSAgICAgICAgYXV0byB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJZGVu dGlmaWVyKCk7Ci0gICAgICAgIGlmICghdGFyZ2V0SWRlbnRpZmllcikKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVu dGlmaWVyLCB0YXJnZXQpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgIXJlc3VsdC5p c05ld0VudHJ5KTsKLQotICAgICAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBqdXN0IGFsbG93ZWQg cmVtb3RlIGNvbnRyb2wsIHRoZW4gdGhlIGxpc3Rpbmcgd29uJ3QgZXhpc3QgeWV0LgotICAgICAg ICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBubyBpZGVudGlmaWVyIHJlbW92ZSB0aGUgb2xkIGxpc3Rp bmcuCi0gICAgICAgIGlmIChSZXRhaW5QdHI8TlNEaWN0aW9uYXJ5PiB0YXJnZXRMaXN0aW5nID0g bGlzdGluZ0ZvclRhcmdldCgqdGFyZ2V0KSkKLSAgICAgICAgICAgIG1fdGFyZ2V0TGlzdGluZ01h cC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0TGlzdGluZyk7Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgICAgIG1fdGFyZ2V0TGlzdGluZ01hcC5yZW1vdmUodGFyZ2V0SWRlbnRpZmllcik7Ci0K LSAgICAgICAgLy8gRG9uJ3QgYWxsb3cgYXV0b21hdGljIGluc3BlY3Rpb24gdW5sZXNzIGl0IGlz IGFsbG93ZWQgb3Igd2UgYXJlIHN0b3BwZWQuCi0gICAgICAgIGlmICghbV9hdXRvbWF0aWNJbnNw ZWN0aW9uRW5hYmxlZCB8fCAhbV9lbmFibGVkKSB7Ci0gICAgICAgICAgICBwdXNoTGlzdGluZ3NT b29uKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICAvLyBGSVhN RTogV2Ugc2hvdWxkIGhhbmRsZSBtdWx0aXBsZSBkZWJ1Z2dhYmxlcyB0cnlpbmcgdG8gcGF1c2Ug YXQgdGhlIHNhbWUgdGltZSBvbiBkaWZmZXJlbnQgdGhyZWFkcy4KLSAgICAgICAgLy8gVG8gbWFr ZSB0aGlzIHdvcmsgd2Ugd2lsbCBuZWVkIHRvIGNoYW5nZSBtX2F1dG9tYXRpY0luc3BlY3Rpb25D YW5kaWRhdGVUYXJnZXRJZGVudGlmaWVyIHRvIGJlIGEgcGVyLXRocmVhZCB2YWx1ZS4KLSAgICAg ICAgLy8gTXVsdGlwbGUgYXR0ZW1wdHMgb24gdGhlIHNhbWUgdGhyZWFkIHNob3VsZCBub3QgYmUg cG9zc2libGUgYmVjYXVzZSBvdXIgbmVzdGVkIHJ1biBsb29wIGlzIGluIGEgc3BlY2lhbCBSV0kg bW9kZS4KLSAgICAgICAgaWYgKG1fYXV0b21hdGljSW5zcGVjdGlvblBhdXNlZCkgewotICAgICAg ICAgICAgTE9HX0VSUk9SKCJTa2lwcGluZyBBdXRvbWF0aWMgSW5zcGVjdGlvbiBDYW5kaWRhdGUg d2l0aCBwYWdlSWQoJXUpIGJlY2F1c2Ugd2UgYXJlIGFscmVhZHkgcGF1c2VkIHdhaXRpbmcgZm9y IHBhZ2VJZCgldSkiLCB0YXJnZXRJZGVudGlmaWVyLCBtX2F1dG9tYXRpY0luc3BlY3Rpb25DYW5k aWRhdGVUYXJnZXRJZGVudGlmaWVyKTsKLSAgICAgICAgICAgIHB1c2hMaXN0aW5nc1Nvb24oKTsK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIG1fYXV0b21hdGljSW5z cGVjdGlvblBhdXNlZCA9IHRydWU7Ci0gICAgICAgIG1fYXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZVRhcmdldElkZW50aWZpZXIgPSB0YXJnZXRJZGVudGlmaWVyOwotCi0gICAgICAgIC8vIElm IHdlIGFyZSBwYXVzaW5nIGJlZm9yZSB3ZSBoYXZlIGNvbm5lY3RlZCB0byB3ZWJpbnNwZWN0b3Jk IHRoZSBjYW5kaWRhdGUgbWVzc2FnZSB3aWxsIGJlIHNlbnQgYXMgc29vbiBhcyB0aGUgY29ubmVj dGlvbiBpcyBlc3RhYmxpc2hlZC4KLSAgICAgICAgaWYgKG1fcmVsYXlDb25uZWN0aW9uKSB7Ci0g ICAgICAgICAgICBwdXNoTGlzdGluZ3NOb3coKTsKLSAgICAgICAgICAgIHNlbmRBdXRvbWF0aWNJ bnNwZWN0aW9uQ2FuZGlkYXRlTWVzc2FnZSgpOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gSW4g Y2FzZSBkZWJ1Z2dlcnMgZmFpbCB0byByZXNwb25kLCBvciB3ZSBjYW5ub3QgY29ubmVjdCB0byB3 ZWJpbnNwZWN0b3JkLCBhdXRvbWF0aWNhbGx5IGNvbnRpbnVlIGFmdGVyIGEgc2hvcnQgcGVyaW9k IG9mIHRpbWUuCi0jaWYgUExBVEZPUk0oV0FUQ0hPUykKLSAgICAgICAgaW50NjRfdCBkZWJ1Z2dl clRpbWVvdXREZWxheSA9IDU7Ci0jZWxzZQotICAgICAgICBpbnQ2NF90IGRlYnVnZ2VyVGltZW91 dERlbGF5ID0gMTsKLSNlbmRpZgotICAgICAgICBkaXNwYXRjaF9hZnRlcihkaXNwYXRjaF90aW1l KERJU1BBVENIX1RJTUVfTk9XLCBkZWJ1Z2dlclRpbWVvdXREZWxheSAqIE5TRUNfUEVSX1NFQyks IGRpc3BhdGNoX2dldF9nbG9iYWxfcXVldWUoRElTUEFUQ0hfUVVFVUVfUFJJT1JJVFlfREVGQVVM VCwgMCksIF57Ci0gICAgICAgICAgICBMb2NrSG9sZGVyIGxvY2sobV9tdXRleCk7Ci0gICAgICAg ICAgICBpZiAobV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0SWRlbnRpZmllciA9 PSB0YXJnZXRJZGVudGlmaWVyKSB7Ci0gICAgICAgICAgICAgICAgTE9HX0VSUk9SKCJTa2lwcGlu ZyBBdXRvbWF0aWMgSW5zcGVjdGlvbiBDYW5kaWRhdGUgd2l0aCBwYWdlSWQoJXUpIGJlY2F1c2Ug d2UgZmFpbGVkIHRvIHJlY2VpdmUgYSByZXNwb25zZSBpbiB0aW1lLiIsIG1fYXV0b21hdGljSW5z cGVjdGlvbkNhbmRpZGF0ZVRhcmdldElkZW50aWZpZXIpOwotICAgICAgICAgICAgICAgIG1fYXV0 b21hdGljSW5zcGVjdGlvblBhdXNlZCA9IGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICB9 KTsKLSAgICB9Ci0KLSAgICB0YXJnZXQtPnBhdXNlV2FpdGluZ0ZvckF1dG9tYXRpY0luc3BlY3Rp b24oKTsKLQotICAgIHsKLSAgICAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOwotCi0gICAg ICAgIEFTU0VSVChtX2F1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGVUYXJnZXRJZGVudGlmaWVy KTsKLSAgICAgICAgbV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0SWRlbnRpZmll ciA9IDA7Ci0gICAgfQotfQotCiB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6c2VuZEF1dG9tYXRpY0lu c3BlY3Rpb25DYW5kaWRhdGVNZXNzYWdlKCkKIHsKICAgICBBU1NFUlQobV9lbmFibGVkKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIvUmVt b3RlSW5zcGVjdG9yR2xpYi5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Jl bW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwCmluZGV4IDVhZmY4YjNlM2ZkLi5kNzcx ZmY3MmFmYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1v dGUvZ2xpYi9SZW1vdGVJbnNwZWN0b3JHbGliLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwCkBAIC0yNDAs MjggKzI0MCw2IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpwdXNoTGlzdGluZ3NTb29uKCkKICAg ICB9KTsKIH0KIAotdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rp b25DYW5kaWRhdGUoUmVtb3RlSW5zcGVjdGlvblRhcmdldCogdGFyZ2V0KQotewotICAgIExvY2tI b2xkZXIgbG9jayhtX211dGV4KTsKLQotICAgIEFTU0VSVCh0YXJnZXQpOwotICAgIGF1dG8gdGFy Z2V0SWRlbnRpZmllciA9IHRhcmdldC0+dGFyZ2V0SWRlbnRpZmllcigpOwotICAgIGlmICghdGFy Z2V0SWRlbnRpZmllcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0byByZXN1bHQgPSBtX3Rh cmdldE1hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0KTsKLSAgICBBU1NFUlRfVU5VU0VE KHJlc3VsdCwgIXJlc3VsdC5pc05ld0VudHJ5KTsKLQotICAgIC8vIElmIHRoZSB0YXJnZXQgaGFz IGp1c3QgYWxsb3dlZCByZW1vdGUgY29udHJvbCwgdGhlbiB0aGUgbGlzdGluZyB3b24ndCBleGlz dCB5ZXQuCi0gICAgLy8gSWYgdGhlIHRhcmdldCBoYXMgbm8gaWRlbnRpZmllciByZW1vdmUgdGhl IG9sZCBsaXN0aW5nLgotICAgIGlmIChhdXRvIHRhcmdldExpc3RpbmcgPSBsaXN0aW5nRm9yVGFy Z2V0KCp0YXJnZXQpKQotICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAuc2V0KHRhcmdldElkZW50 aWZpZXIsIHRhcmdldExpc3RpbmcpOwotICAgIGVsc2UKLSAgICAgICAgbV90YXJnZXRMaXN0aW5n TWFwLnJlbW92ZSh0YXJnZXRJZGVudGlmaWVyKTsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50IGF1 dG9tYXRpYyBpbnNwZWN0aW9uLgotICAgIHB1c2hMaXN0aW5nc1Nvb24oKTsKLX0KLQogdm9pZCBS ZW1vdGVJbnNwZWN0b3I6OnNlbmRBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlTWVzc2FnZSgp CiB7CiAgICAgQVNTRVJUKG1fZW5hYmxlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9zb2NrZXQvUmVtb3RlSW5zcGVjdG9yU29ja2V0LmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJbnNw ZWN0b3JTb2NrZXQuY3BwCmluZGV4IGI0MzFkZjBhN2Y0Li41MzZkM2M3MGEwYiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUlu c3BlY3RvclNvY2tldC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKQEAgLTE4NCwxMCArMTg0LDYg QEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwogfQog Ci12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0 ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KikKLXsKLX0KLQogdm9pZCBSZW1vdGVJbnNwZWN0b3I6 OnNlbmRBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlTWVzc2FnZSgpCiB7CiB9Cg== 368635 2019-04-30 17:41:15 -0700 2019-05-01 13:52:31 -0700 PATCH 197439.diff text/plain 6266 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDM4Y2NhZTJiOTZlLi5iZDM3Yjg2MDNlMiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDQtMzAgIEJhc3Vr ZSBTdXp1a2kgIDxCYXN1a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtQbGF5U3RhdGlv bl0gdGFyZ2V0TGlzdGluZ01hcCBpcyBub3QgdXBkYXRlIHdoZW4gUmVtb3RlSW5zcGVjdG9yIGhh cyBzdGFydGVkIGFmdGVyIHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEltcGxlbWVudCBgdXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZSgpYCB1c2luZyByZWZhY3RvcmVkIG1ldGhvZCBgdXBkYXRlVGFyZ2V0SW50ZXJuYWwoKWAu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHA6CisgICAg ICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlVGFyZ2V0KToKKyAgICAgICAg KEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVUYXJnZXRJbnRlcm5hbCk6IEV4dHJh Y3RlZCBmcm9tIHVwZGF0ZVRhcmdldCBmb3Igc2hhcmVkIHVzZS4KKyAgICAgICAgKiBpbnNwZWN0 b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oOgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUv Y29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW06CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90 ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZSk6CisgICAgICAg ICogaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwOgorICAgICAg ICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25D YW5kaWRhdGUpOgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3Bl Y3RvclNvY2tldC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBk YXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZSk6CisKIDIwMTktMDQtMjkgIFl1c3VrZSBT dXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBKSVRTdHViUm91dGluZVNldCB3 YXN0ZXMgMTgwS0Igb2YgSGFzaFRhYmxlIGNhcGFjaXR5IG9uIGNhbi5jb20KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3IuY3BwCmluZGV4IDlhNmE5NmYyOTA2Li5iNTZlOGMxZDY3ZiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3Iu Y3BwCkBAIC0xMDQsOSArMTA0LDE3IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVUYXJn ZXQoUmVtb3RlQ29udHJvbGxhYmxlVGFyZ2V0KiB0YXJnZXQpCiAKICAgICBMb2NrSG9sZGVyIGxv Y2sobV9tdXRleCk7CiAKKyAgICBpZiAodXBkYXRlVGFyZ2V0SW50ZXJuYWwoKSkKKyAgICAgICAg cHVzaExpc3RpbmdzU29vbigpOworfQorCitib29sIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlVGFy Z2V0SW50ZXJuYWwoUmVtb3RlQ29udHJvbGxhYmxlVGFyZ2V0KiB0YXJnZXQpCit7CisgICAgQVNT RVJUKG1fbXV0ZXguaXNMb2NrZWQoKSk7CisKICAgICBhdXRvIHRhcmdldElkZW50aWZpZXIgPSB0 YXJnZXQtPnRhcmdldElkZW50aWZpZXIoKTsKICAgICBpZiAoIXRhcmdldElkZW50aWZpZXIpCi0g ICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgewogICAgICAgICBh dXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVudGlmaWVyLCB0YXJnZXQpOwpA QCAtMTIwLDcgKzEyOCw3IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVUYXJnZXQoUmVt b3RlQ29udHJvbGxhYmxlVGFyZ2V0KiB0YXJnZXQpCiAgICAgZWxzZQogICAgICAgICBtX3Rhcmdl dExpc3RpbmdNYXAucmVtb3ZlKHRhcmdldElkZW50aWZpZXIpOwogCi0gICAgcHVzaExpc3Rpbmdz U29vbigpOworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBk YXRlQ2xpZW50Q2FwYWJpbGl0aWVzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKaW5kZXggNzFiN2NmNGVlNTcu LjQ1YzMwZTAyNGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaApAQCAtMTgwLDYgKzE4MCw4IEBAIHByaXZh dGU6CiAgICAgVGFyZ2V0TGlzdGluZyBsaXN0aW5nRm9ySW5zcGVjdGlvblRhcmdldChjb25zdCBS ZW1vdGVJbnNwZWN0aW9uVGFyZ2V0JikgY29uc3Q7CiAgICAgVGFyZ2V0TGlzdGluZyBsaXN0aW5n Rm9yQXV0b21hdGlvblRhcmdldChjb25zdCBSZW1vdGVBdXRvbWF0aW9uVGFyZ2V0JikgY29uc3Q7 CiAKKyAgICBib29sIHVwZGF0ZVRhcmdldEludGVybmFsKFJlbW90ZUNvbnRyb2xsYWJsZVRhcmdl dCopOworCiAgICAgdm9pZCBwdXNoTGlzdGluZ3NOb3coKTsKICAgICB2b2lkIHB1c2hMaXN0aW5n c1Nvb24oKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQppbmRleCA1 YmVmMjFjYmIzOS4uOGNlYzdmYjJkOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3Rv ckNvY29hLm1tCkBAIC0xMjIsMjAgKzEyMiw5IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRh dGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKFJlbW90ZUluc3BlY3Rpb25UYXJnZXQqCiAg ICAgewogICAgICAgICBMb2NrSG9sZGVyIGxvY2sobV9tdXRleCk7CiAKLSAgICAgICAgYXV0byB0 YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJZGVudGlmaWVyKCk7Ci0gICAgICAgIGlm ICghdGFyZ2V0SWRlbnRpZmllcikKKyAgICAgICAgaWYgKCF1cGRhdGVUYXJnZXRJbnRlcm5hbCh0 YXJnZXQpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gcmVzdWx0ID0gbV90 YXJnZXRNYXAuc2V0KHRhcmdldElkZW50aWZpZXIsIHRhcmdldCk7Ci0gICAgICAgIEFTU0VSVF9V TlVTRUQocmVzdWx0LCAhcmVzdWx0LmlzTmV3RW50cnkpOwotCi0gICAgICAgIC8vIElmIHRoZSB0 YXJnZXQgaGFzIGp1c3QgYWxsb3dlZCByZW1vdGUgY29udHJvbCwgdGhlbiB0aGUgbGlzdGluZyB3 b24ndCBleGlzdCB5ZXQuCi0gICAgICAgIC8vIElmIHRoZSB0YXJnZXQgaGFzIG5vIGlkZW50aWZp ZXIgcmVtb3ZlIHRoZSBvbGQgbGlzdGluZy4KLSAgICAgICAgaWYgKFJldGFpblB0cjxOU0RpY3Rp b25hcnk+IHRhcmdldExpc3RpbmcgPSBsaXN0aW5nRm9yVGFyZ2V0KCp0YXJnZXQpKQotICAgICAg ICAgICAgbV90YXJnZXRMaXN0aW5nTWFwLnNldCh0YXJnZXRJZGVudGlmaWVyLCB0YXJnZXRMaXN0 aW5nKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV90YXJnZXRMaXN0aW5nTWFwLnJlbW92 ZSh0YXJnZXRJZGVudGlmaWVyKTsKLQogICAgICAgICAvLyBEb24ndCBhbGxvdyBhdXRvbWF0aWMg aW5zcGVjdGlvbiB1bmxlc3MgaXQgaXMgYWxsb3dlZCBvciB3ZSBhcmUgc3RvcHBlZC4KICAgICAg ICAgaWYgKCFtX2F1dG9tYXRpY0luc3BlY3Rpb25FbmFibGVkIHx8ICFtX2VuYWJsZWQpIHsKICAg ICAgICAgICAgIHB1c2hMaXN0aW5nc1Nvb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yR2xpYi5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3Rv ckdsaWIuY3BwCmluZGV4IDVhZmY4YjNlM2ZkLi41MDQ5Y2RkZWUzZiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvZ2xpYi9SZW1vdGVJbnNwZWN0b3JH bGliLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGli L1JlbW90ZUluc3BlY3RvckdsaWIuY3BwCkBAIC0yNDQsMjAgKzI0NCw5IEBAIHZvaWQgUmVtb3Rl SW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKFJlbW90ZUluc3Bl Y3Rpb25UYXJnZXQqCiB7CiAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOwogCi0gICAgQVNT RVJUKHRhcmdldCk7Ci0gICAgYXV0byB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJ ZGVudGlmaWVyKCk7Ci0gICAgaWYgKCF0YXJnZXRJZGVudGlmaWVyKQorICAgIGlmICghdXBkYXRl VGFyZ2V0SW50ZXJuYWwodGFyZ2V0KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byByZXN1 bHQgPSBtX3RhcmdldE1hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0KTsKLSAgICBBU1NF UlRfVU5VU0VEKHJlc3VsdCwgIXJlc3VsdC5pc05ld0VudHJ5KTsKLQotICAgIC8vIElmIHRoZSB0 YXJnZXQgaGFzIGp1c3QgYWxsb3dlZCByZW1vdGUgY29udHJvbCwgdGhlbiB0aGUgbGlzdGluZyB3 b24ndCBleGlzdCB5ZXQuCi0gICAgLy8gSWYgdGhlIHRhcmdldCBoYXMgbm8gaWRlbnRpZmllciBy ZW1vdmUgdGhlIG9sZCBsaXN0aW5nLgotICAgIGlmIChhdXRvIHRhcmdldExpc3RpbmcgPSBsaXN0 aW5nRm9yVGFyZ2V0KCp0YXJnZXQpKQotICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAuc2V0KHRh cmdldElkZW50aWZpZXIsIHRhcmdldExpc3RpbmcpOwotICAgIGVsc2UKLSAgICAgICAgbV90YXJn ZXRMaXN0aW5nTWFwLnJlbW92ZSh0YXJnZXRJZGVudGlmaWVyKTsKICAgICAvLyBGSVhNRTogSW1w bGVtZW50IGF1dG9tYXRpYyBpbnNwZWN0aW9uLgogICAgIHB1c2hMaXN0aW5nc1Nvb24oKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL3NvY2tl dC9SZW1vdGVJbnNwZWN0b3JTb2NrZXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKaW5kZXggYjQzMWRm MGE3ZjQuLjdiMWU0ZmU1MzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL3JlbW90ZS9zb2NrZXQvUmVtb3RlSW5zcGVjdG9yU29ja2V0LmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9zb2NrZXQvUmVtb3RlSW5zcGVjdG9y U29ja2V0LmNwcApAQCAtMTg2LDYgKzE4NiwxMyBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6cHVz aExpc3RpbmdzU29vbigpCiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJ bnNwZWN0aW9uQ2FuZGlkYXRlKFJlbW90ZUluc3BlY3Rpb25UYXJnZXQqKQogeworICAgIExvY2tI b2xkZXIgbG9jayhtX211dGV4KTsKKworICAgIGlmICghdXBkYXRlVGFyZ2V0SW50ZXJuYWwodGFy Z2V0KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gRklYTUU6IEltcGxlbWVudCBhdXRvbWF0 aWMgaW5zcGVjdGlvbi4KKyAgICBwdXNoTGlzdGluZ3NTb29uKCk7CiB9CiAKIHZvaWQgUmVtb3Rl SW5zcGVjdG9yOjpzZW5kQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZU1lc3NhZ2UoKQo= 368703 2019-05-01 13:52:32 -0700 2019-05-01 15:26:58 -0700 Patch bug-197439-20190501135230.patch text/plain 8746 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj NTRiZjM4Y2U2ODhiNDEzNjZkOGY2NjgwMjc3MjYzYzNjMjY3MTE2Li4xN2U0ODY4Yzc3MmE0OTg0 NDI0N2ZiMGM0MjY0NWY1ZWU3MjRiZTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOS0wNS0wMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0 aW9uQ2FuZGlkYXRlIHNob3VsZCBoYXZlIGEgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9uIG5vbi1Db2NvYSBw bGF0Zm9ybXMsIGF1dG9tYXRpYyBpbnNwZWN0aW9uIGlzIG5vdCBjdXJyZW50bHkgaW1wbGVtZW50 ZWQsCisgICAgICAgIHNvIHVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGUgZmFsbHMg YmFjayB0byB0aGUgbG9naWMgb2YgdXBkYXRlVGFyZ2V0LgorICAgICAgICBUaGlzIGxvZ2ljIGFs cmVhZHkgZXhpc3RlZCBpbiB0aHJlZSBwbGFjZXMsIHNvIHJlZmFjdG9yIGl0IGludG8gYSBjb21t b24gcHJpdmF0ZSBtZXRob2QKKyAgICAgICAgYW5kIGFsbG93IG91ciB3ZWJzb2NrZXQtYmFzZWQg UldJIGltcGxlbWVudGF0aW9uIHRvIG1ha2UgdXNlIG9mIGl0IHRvby4KKworICAgICAgICAqIGlu c3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6 UmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVUYXJnZXQpOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1v dGVJbnNwZWN0b3I6OnVwZGF0ZVRhcmdldEludGVybmFsKToKKyAgICAgICAgKEluc3BlY3Rvcjo6 UmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oOgorICAgICAgICAqIGlu c3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW06CisgICAgICAgIChJ bnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3Rvckds aWIuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9t YXRpY0luc3BlY3Rpb25DYW5kaWRhdGUpOiBEZWxldGVkLgorICAgICAgICAqIGluc3BlY3Rvci9y ZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHA6CisgICAgICAgIChJbnNwZWN0 b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZSk6 IERlbGV0ZWQuCisKIDIwMTktMDUtMDEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYktpdCBoYXMgdG9vIG11Y2ggb2YgaXRzIG93biBVVEYtOCBjb2RlIGFuZCBz aG91bGQgcmVseSBtb3JlIG9uIElDVSdzIFVURi04IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuY3Bw CmluZGV4IDlhNmE5NmYyOTA2Zjg5ZWViNzk2YmYyM2EwNzgxNDJjMzIyNTFmMmYuLmYxZTM0Y2U4 YTE0ZmY1ODJkYTM3M2U3MjY4ZjA3OGM1YWQ5M2M0MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcApA QCAtMTA0LDE0ICsxMDQsMjIgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZVRhcmdldChS ZW1vdGVDb250cm9sbGFibGVUYXJnZXQqIHRhcmdldCkKIAogICAgIExvY2tIb2xkZXIgbG9jayht X211dGV4KTsKIAorICAgIGlmICghdXBkYXRlVGFyZ2V0SW50ZXJuYWwodGFyZ2V0KSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgcHVzaExpc3RpbmdzU29vbigpOworfQorCitib29sIFJlbW90ZUlu c3BlY3Rvcjo6dXBkYXRlVGFyZ2V0SW50ZXJuYWwoUmVtb3RlQ29udHJvbGxhYmxlVGFyZ2V0KiB0 YXJnZXQpCit7CisgICAgQVNTRVJUKG1fbXV0ZXguaXNMb2NrZWQoKSk7CisKICAgICBhdXRvIHRh cmdldElkZW50aWZpZXIgPSB0YXJnZXQtPnRhcmdldElkZW50aWZpZXIoKTsKICAgICBpZiAoIXRh cmdldElkZW50aWZpZXIpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgewotICAgICAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVu dGlmaWVyLCB0YXJnZXQpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgIXJlc3VsdC5p c05ld0VudHJ5KTsKLSAgICB9CisgICAgYXV0byByZXN1bHQgPSBtX3RhcmdldE1hcC5zZXQodGFy Z2V0SWRlbnRpZmllciwgdGFyZ2V0KTsKKyAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgIXJlc3Vs dC5pc05ld0VudHJ5KTsKIAogICAgIC8vIElmIHRoZSB0YXJnZXQgaGFzIGp1c3QgYWxsb3dlZCBy ZW1vdGUgY29udHJvbCwgdGhlbiB0aGUgbGlzdGluZyB3b24ndCBleGlzdCB5ZXQuCiAgICAgLy8g SWYgdGhlIHRhcmdldCBoYXMgbm8gaWRlbnRpZmllciByZW1vdmUgdGhlIG9sZCBsaXN0aW5nLgpA QCAtMTIwLDggKzEyOCwxNiBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlVGFyZ2V0KFJl bW90ZUNvbnRyb2xsYWJsZVRhcmdldCogdGFyZ2V0KQogICAgIGVsc2UKICAgICAgICAgbV90YXJn ZXRMaXN0aW5nTWFwLnJlbW92ZSh0YXJnZXRJZGVudGlmaWVyKTsKIAotICAgIHB1c2hMaXN0aW5n c1Nvb24oKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworI2lmICFQTEFURk9STShDT0NPQSkKK3Zv aWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKFJl bW90ZUluc3BlY3Rpb25UYXJnZXQqIHRhcmdldCkKK3sKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50 IGF1dG9tYXRpYyBpbnNwZWN0aW9uLgorICAgIHVwZGF0ZVRhcmdldCh0YXJnZXQpOwogfQorI2Vu ZGlmCiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVDbGllbnRDYXBhYmlsaXRpZXMoKQog ewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3IuaAppbmRleCA3MWI3Y2Y0ZWU1NzdkMGJiMDI3ZWM4OWVjMWIzOGI3YjUw MTQ2YjQzLi40NWMzMGUwMjRkODAyODYzMzc4MTk0MDNkY2VlM2Y0MmVmOGUzOWJlIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJ bnNwZWN0b3IuaApAQCAtMTgwLDYgKzE4MCw4IEBAIHByaXZhdGU6CiAgICAgVGFyZ2V0TGlzdGlu ZyBsaXN0aW5nRm9ySW5zcGVjdGlvblRhcmdldChjb25zdCBSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0 JikgY29uc3Q7CiAgICAgVGFyZ2V0TGlzdGluZyBsaXN0aW5nRm9yQXV0b21hdGlvblRhcmdldChj b25zdCBSZW1vdGVBdXRvbWF0aW9uVGFyZ2V0JikgY29uc3Q7CiAKKyAgICBib29sIHVwZGF0ZVRh cmdldEludGVybmFsKFJlbW90ZUNvbnRyb2xsYWJsZVRhcmdldCopOworCiAgICAgdm9pZCBwdXNo TGlzdGluZ3NOb3coKTsKICAgICB2b2lkIHB1c2hMaXN0aW5nc1Nvb24oKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5z cGVjdG9yQ29jb2EubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9j b2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQppbmRleCAxMTY2N2E4YmQ3YTc5NDE0MTAyZmRk ZDMyMjNkMzczYjU2NWQ0OWFhLi5iMThmNmQ1YWM3MmJiNGU3M2JlYzhiZDY1ZGUxNzBkMjQ0NjJk YTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9j b2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQpAQCAtMTIyLDIw ICsxMjIsOSBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlv bkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KgogICAgIHsKICAgICAgICAgTG9ja0hv bGRlciBsb2NrKG1fbXV0ZXgpOwogCi0gICAgICAgIGF1dG8gdGFyZ2V0SWRlbnRpZmllciA9IHRh cmdldC0+dGFyZ2V0SWRlbnRpZmllcigpOwotICAgICAgICBpZiAoIXRhcmdldElkZW50aWZpZXIp CisgICAgICAgIGlmICghdXBkYXRlVGFyZ2V0SW50ZXJuYWwodGFyZ2V0KSkKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJ ZGVudGlmaWVyLCB0YXJnZXQpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgIXJlc3Vs dC5pc05ld0VudHJ5KTsKLQotICAgICAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBqdXN0IGFsbG93 ZWQgcmVtb3RlIGNvbnRyb2wsIHRoZW4gdGhlIGxpc3Rpbmcgd29uJ3QgZXhpc3QgeWV0LgotICAg ICAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBubyBpZGVudGlmaWVyIHJlbW92ZSB0aGUgb2xkIGxp c3RpbmcuCi0gICAgICAgIGlmIChSZXRhaW5QdHI8TlNEaWN0aW9uYXJ5PiB0YXJnZXRMaXN0aW5n ID0gbGlzdGluZ0ZvclRhcmdldCgqdGFyZ2V0KSkKLSAgICAgICAgICAgIG1fdGFyZ2V0TGlzdGlu Z01hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0TGlzdGluZyk7Ci0gICAgICAgIGVsc2UK LSAgICAgICAgICAgIG1fdGFyZ2V0TGlzdGluZ01hcC5yZW1vdmUodGFyZ2V0SWRlbnRpZmllcik7 Ci0KICAgICAgICAgLy8gRG9uJ3QgYWxsb3cgYXV0b21hdGljIGluc3BlY3Rpb24gdW5sZXNzIGl0 IGlzIGFsbG93ZWQgb3Igd2UgYXJlIHN0b3BwZWQuCiAgICAgICAgIGlmICghbV9hdXRvbWF0aWNJ bnNwZWN0aW9uRW5hYmxlZCB8fCAhbV9lbmFibGVkKSB7CiAgICAgICAgICAgICBwdXNoTGlzdGlu Z3NTb29uKCk7CkBAIC0xNDYsMTMgKzEzNSwxMyBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBk YXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0Kgog ICAgICAgICAvLyBUbyBtYWtlIHRoaXMgd29yayB3ZSB3aWxsIG5lZWQgdG8gY2hhbmdlIG1fYXV0 b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZVRhcmdldElkZW50aWZpZXIgdG8gYmUgYSBwZXItdGhy ZWFkIHZhbHVlLgogICAgICAgICAvLyBNdWx0aXBsZSBhdHRlbXB0cyBvbiB0aGUgc2FtZSB0aHJl YWQgc2hvdWxkIG5vdCBiZSBwb3NzaWJsZSBiZWNhdXNlIG91ciBuZXN0ZWQgcnVuIGxvb3AgaXMg aW4gYSBzcGVjaWFsIFJXSSBtb2RlLgogICAgICAgICBpZiAobV9hdXRvbWF0aWNJbnNwZWN0aW9u UGF1c2VkKSB7Ci0gICAgICAgICAgICBMT0dfRVJST1IoIlNraXBwaW5nIEF1dG9tYXRpYyBJbnNw ZWN0aW9uIENhbmRpZGF0ZSB3aXRoIHBhZ2VJZCgldSkgYmVjYXVzZSB3ZSBhcmUgYWxyZWFkeSBw YXVzZWQgd2FpdGluZyBmb3IgcGFnZUlkKCV1KSIsIHRhcmdldElkZW50aWZpZXIsIG1fYXV0b21h dGljSW5zcGVjdGlvbkNhbmRpZGF0ZVRhcmdldElkZW50aWZpZXIpOworICAgICAgICAgICAgTE9H X0VSUk9SKCJTa2lwcGluZyBBdXRvbWF0aWMgSW5zcGVjdGlvbiBDYW5kaWRhdGUgd2l0aCBwYWdl SWQoJXUpIGJlY2F1c2Ugd2UgYXJlIGFscmVhZHkgcGF1c2VkIHdhaXRpbmcgZm9yIHBhZ2VJZCgl dSkiLCB0YXJnZXQtPnRhcmdldElkZW50aWZpZXIoKSwgbV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2Fu ZGlkYXRlVGFyZ2V0SWRlbnRpZmllcik7CiAgICAgICAgICAgICBwdXNoTGlzdGluZ3NTb29uKCk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAgICBtX2F1dG9tYXRpY0lu c3BlY3Rpb25QYXVzZWQgPSB0cnVlOwotICAgICAgICBtX2F1dG9tYXRpY0luc3BlY3Rpb25DYW5k aWRhdGVUYXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0SWRlbnRpZmllcjsKKyAgICAgICAgbV9hdXRv bWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0SWRlbnRpZmllciA9IHRhcmdldC0+dGFyZ2V0 SWRlbnRpZmllcigpOwogCiAgICAgICAgIC8vIElmIHdlIGFyZSBwYXVzaW5nIGJlZm9yZSB3ZSBo YXZlIGNvbm5lY3RlZCB0byB3ZWJpbnNwZWN0b3JkIHRoZSBjYW5kaWRhdGUgbWVzc2FnZSB3aWxs IGJlIHNlbnQgYXMgc29vbiBhcyB0aGUgY29ubmVjdGlvbiBpcyBlc3RhYmxpc2hlZC4KICAgICAg ICAgaWYgKG1fcmVsYXlDb25uZWN0aW9uKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvZ2xpYi9SZW1vdGVJbnNwZWN0b3JH bGliLmNwcAppbmRleCA1YWZmOGIzZTNmZDdiNjBkMmM0YzZlOThiYzA1MGZhNzNiZjkwNDE3Li5k NzcxZmY3MmFmY2JjNTUwYzg2Njc5ZGUyMWQzYTcwOTQzNjUxMWUzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3Rvckds aWIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIv UmVtb3RlSW5zcGVjdG9yR2xpYi5jcHAKQEAgLTI0MCwyOCArMjQwLDYgQEAgdm9pZCBSZW1vdGVJ bnNwZWN0b3I6OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwogfQogCi12b2lkIFJlbW90ZUlu c3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0 aW9uVGFyZ2V0KiB0YXJnZXQpCi17Ci0gICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOwotCi0g ICAgQVNTRVJUKHRhcmdldCk7Ci0gICAgYXV0byB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50 YXJnZXRJZGVudGlmaWVyKCk7Ci0gICAgaWYgKCF0YXJnZXRJZGVudGlmaWVyKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVudGlm aWVyLCB0YXJnZXQpOwotICAgIEFTU0VSVF9VTlVTRUQocmVzdWx0LCAhcmVzdWx0LmlzTmV3RW50 cnkpOwotCi0gICAgLy8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBhbGxvd2VkIHJlbW90ZSBjb250 cm9sLCB0aGVuIHRoZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4KLSAgICAvLyBJZiB0aGUgdGFy Z2V0IGhhcyBubyBpZGVudGlmaWVyIHJlbW92ZSB0aGUgb2xkIGxpc3RpbmcuCi0gICAgaWYgKGF1 dG8gdGFyZ2V0TGlzdGluZyA9IGxpc3RpbmdGb3JUYXJnZXQoKnRhcmdldCkpCi0gICAgICAgIG1f dGFyZ2V0TGlzdGluZ01hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0TGlzdGluZyk7Ci0g ICAgZWxzZQotICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAucmVtb3ZlKHRhcmdldElkZW50aWZp ZXIpOwotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgYXV0b21hdGljIGluc3BlY3Rpb24uCi0gICAg cHVzaExpc3RpbmdzU29vbigpOwotfQotCiB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6c2VuZEF1dG9t YXRpY0luc3BlY3Rpb25DYW5kaWRhdGVNZXNzYWdlKCkKIHsKICAgICBBU1NFUlQobV9lbmFibGVk KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL3Nv Y2tldC9SZW1vdGVJbnNwZWN0b3JTb2NrZXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKaW5kZXggYjQz MWRmMGE3ZjRjMjNhYTg2NGU4YzdjZTYyNjU1ZTE1YjczZDgxNC4uNTM2ZDNjNzBhMGIyZTBmN2Rj NDIzN2JjZjBmMGJlYWQzMmY1ZTBlYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3Bl Y3RvclNvY2tldC5jcHAKQEAgLTE4NCwxMCArMTg0LDYgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6 OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwogfQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6 dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0 KikKLXsKLX0KLQogdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnNlbmRBdXRvbWF0aWNJbnNwZWN0aW9u Q2FuZGlkYXRlTWVzc2FnZSgpCiB7CiB9Cg== 368721 2019-05-01 15:26:59 -0700 2019-05-01 17:03:03 -0700 Patch bug-197439-20190501152658.patch text/plain 7936 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj NTRiZjM4Y2U2ODhiNDEzNjZkOGY2NjgwMjc3MjYzYzNjMjY3MTE2Li4xN2U0ODY4Yzc3MmE0OTg0 NDI0N2ZiMGM0MjY0NWY1ZWU3MjRiZTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOS0wNS0wMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0 aW9uQ2FuZGlkYXRlIHNob3VsZCBoYXZlIGEgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9uIG5vbi1Db2NvYSBw bGF0Zm9ybXMsIGF1dG9tYXRpYyBpbnNwZWN0aW9uIGlzIG5vdCBjdXJyZW50bHkgaW1wbGVtZW50 ZWQsCisgICAgICAgIHNvIHVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGUgZmFsbHMg YmFjayB0byB0aGUgbG9naWMgb2YgdXBkYXRlVGFyZ2V0LgorICAgICAgICBUaGlzIGxvZ2ljIGFs cmVhZHkgZXhpc3RlZCBpbiB0aHJlZSBwbGFjZXMsIHNvIHJlZmFjdG9yIGl0IGludG8gYSBjb21t b24gcHJpdmF0ZSBtZXRob2QKKyAgICAgICAgYW5kIGFsbG93IG91ciB3ZWJzb2NrZXQtYmFzZWQg UldJIGltcGxlbWVudGF0aW9uIHRvIG1ha2UgdXNlIG9mIGl0IHRvby4KKworICAgICAgICAqIGlu c3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6 UmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVUYXJnZXQpOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1v dGVJbnNwZWN0b3I6OnVwZGF0ZVRhcmdldEludGVybmFsKToKKyAgICAgICAgKEluc3BlY3Rvcjo6 UmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oOgorICAgICAgICAqIGlu c3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW06CisgICAgICAgIChJ bnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3Rvckds aWIuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9t YXRpY0luc3BlY3Rpb25DYW5kaWRhdGUpOiBEZWxldGVkLgorICAgICAgICAqIGluc3BlY3Rvci9y ZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHA6CisgICAgICAgIChJbnNwZWN0 b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZSk6 IERlbGV0ZWQuCisKIDIwMTktMDUtMDEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYktpdCBoYXMgdG9vIG11Y2ggb2YgaXRzIG93biBVVEYtOCBjb2RlIGFuZCBz aG91bGQgcmVseSBtb3JlIG9uIElDVSdzIFVURi04IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuY3Bw CmluZGV4IDlhNmE5NmYyOTA2Zjg5ZWViNzk2YmYyM2EwNzgxNDJjMzIyNTFmMmYuLmYxZTM0Y2U4 YTE0ZmY1ODJkYTM3M2U3MjY4ZjA3OGM1YWQ5M2M0MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcApA QCAtMTA0LDE0ICsxMDQsMjIgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZVRhcmdldChS ZW1vdGVDb250cm9sbGFibGVUYXJnZXQqIHRhcmdldCkKIAogICAgIExvY2tIb2xkZXIgbG9jayht X211dGV4KTsKIAorICAgIGlmICghdXBkYXRlVGFyZ2V0SW50ZXJuYWwodGFyZ2V0KSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgcHVzaExpc3RpbmdzU29vbigpOworfQorCitib29sIFJlbW90ZUlu c3BlY3Rvcjo6dXBkYXRlVGFyZ2V0SW50ZXJuYWwoUmVtb3RlQ29udHJvbGxhYmxlVGFyZ2V0KiB0 YXJnZXQpCit7CisgICAgQVNTRVJUKG1fbXV0ZXguaXNMb2NrZWQoKSk7CisKICAgICBhdXRvIHRh cmdldElkZW50aWZpZXIgPSB0YXJnZXQtPnRhcmdldElkZW50aWZpZXIoKTsKICAgICBpZiAoIXRh cmdldElkZW50aWZpZXIpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgewotICAgICAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVu dGlmaWVyLCB0YXJnZXQpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgIXJlc3VsdC5p c05ld0VudHJ5KTsKLSAgICB9CisgICAgYXV0byByZXN1bHQgPSBtX3RhcmdldE1hcC5zZXQodGFy Z2V0SWRlbnRpZmllciwgdGFyZ2V0KTsKKyAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgIXJlc3Vs dC5pc05ld0VudHJ5KTsKIAogICAgIC8vIElmIHRoZSB0YXJnZXQgaGFzIGp1c3QgYWxsb3dlZCBy ZW1vdGUgY29udHJvbCwgdGhlbiB0aGUgbGlzdGluZyB3b24ndCBleGlzdCB5ZXQuCiAgICAgLy8g SWYgdGhlIHRhcmdldCBoYXMgbm8gaWRlbnRpZmllciByZW1vdmUgdGhlIG9sZCBsaXN0aW5nLgpA QCAtMTIwLDggKzEyOCwxNiBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlVGFyZ2V0KFJl bW90ZUNvbnRyb2xsYWJsZVRhcmdldCogdGFyZ2V0KQogICAgIGVsc2UKICAgICAgICAgbV90YXJn ZXRMaXN0aW5nTWFwLnJlbW92ZSh0YXJnZXRJZGVudGlmaWVyKTsKIAotICAgIHB1c2hMaXN0aW5n c1Nvb24oKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworI2lmICFQTEFURk9STShDT0NPQSkKK3Zv aWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKFJl bW90ZUluc3BlY3Rpb25UYXJnZXQqIHRhcmdldCkKK3sKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50 IGF1dG9tYXRpYyBpbnNwZWN0aW9uLgorICAgIHVwZGF0ZVRhcmdldCh0YXJnZXQpOwogfQorI2Vu ZGlmCiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVDbGllbnRDYXBhYmlsaXRpZXMoKQog ewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3IuaAppbmRleCA3MWI3Y2Y0ZWU1NzdkMGJiMDI3ZWM4OWVjMWIzOGI3YjUw MTQ2YjQzLi40NWMzMGUwMjRkODAyODYzMzc4MTk0MDNkY2VlM2Y0MmVmOGUzOWJlIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJ bnNwZWN0b3IuaApAQCAtMTgwLDYgKzE4MCw4IEBAIHByaXZhdGU6CiAgICAgVGFyZ2V0TGlzdGlu ZyBsaXN0aW5nRm9ySW5zcGVjdGlvblRhcmdldChjb25zdCBSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0 JikgY29uc3Q7CiAgICAgVGFyZ2V0TGlzdGluZyBsaXN0aW5nRm9yQXV0b21hdGlvblRhcmdldChj b25zdCBSZW1vdGVBdXRvbWF0aW9uVGFyZ2V0JikgY29uc3Q7CiAKKyAgICBib29sIHVwZGF0ZVRh cmdldEludGVybmFsKFJlbW90ZUNvbnRyb2xsYWJsZVRhcmdldCopOworCiAgICAgdm9pZCBwdXNo TGlzdGluZ3NOb3coKTsKICAgICB2b2lkIHB1c2hMaXN0aW5nc1Nvb24oKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5z cGVjdG9yQ29jb2EubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9j b2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQppbmRleCAxMTY2N2E4YmQ3YTc5NDE0MTAyZmRk ZDMyMjNkMzczYjU2NWQ0OWFhLi42Y2VlNzk3MDVmM2FkNWNiZmRjZDAwYzRlZDI3MzNhOTU4MmVl ZjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9j b2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQpAQCAtMTIyLDI2 ICsxMjIsMTcgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rp b25DYW5kaWRhdGUoUmVtb3RlSW5zcGVjdGlvblRhcmdldCoKICAgICB7CiAgICAgICAgIExvY2tI b2xkZXIgbG9jayhtX211dGV4KTsKIAotICAgICAgICBhdXRvIHRhcmdldElkZW50aWZpZXIgPSB0 YXJnZXQtPnRhcmdldElkZW50aWZpZXIoKTsKLSAgICAgICAgaWYgKCF0YXJnZXRJZGVudGlmaWVy KQorICAgICAgICBpZiAoIXVwZGF0ZVRhcmdldEludGVybmFsKHRhcmdldCkpCiAgICAgICAgICAg ICByZXR1cm47CiAKLSAgICAgICAgYXV0byByZXN1bHQgPSBtX3RhcmdldE1hcC5zZXQodGFyZ2V0 SWRlbnRpZmllciwgdGFyZ2V0KTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsICFyZXN1 bHQuaXNOZXdFbnRyeSk7Ci0KLSAgICAgICAgLy8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBhbGxv d2VkIHJlbW90ZSBjb250cm9sLCB0aGVuIHRoZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4KLSAg ICAgICAgLy8gSWYgdGhlIHRhcmdldCBoYXMgbm8gaWRlbnRpZmllciByZW1vdmUgdGhlIG9sZCBs aXN0aW5nLgotICAgICAgICBpZiAoUmV0YWluUHRyPE5TRGljdGlvbmFyeT4gdGFyZ2V0TGlzdGlu ZyA9IGxpc3RpbmdGb3JUYXJnZXQoKnRhcmdldCkpCi0gICAgICAgICAgICBtX3RhcmdldExpc3Rp bmdNYXAuc2V0KHRhcmdldElkZW50aWZpZXIsIHRhcmdldExpc3RpbmcpOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAucmVtb3ZlKHRhcmdldElkZW50aWZpZXIp OwotCiAgICAgICAgIC8vIERvbid0IGFsbG93IGF1dG9tYXRpYyBpbnNwZWN0aW9uIHVubGVzcyBp dCBpcyBhbGxvd2VkIG9yIHdlIGFyZSBzdG9wcGVkLgogICAgICAgICBpZiAoIW1fYXV0b21hdGlj SW5zcGVjdGlvbkVuYWJsZWQgfHwgIW1fZW5hYmxlZCkgewogICAgICAgICAgICAgcHVzaExpc3Rp bmdzU29vbigpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAgYXV0 byB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJZGVudGlmaWVyKCk7CisKICAgICAg ICAgLy8gRklYTUU6IFdlIHNob3VsZCBoYW5kbGUgbXVsdGlwbGUgZGVidWdnYWJsZXMgdHJ5aW5n IHRvIHBhdXNlIGF0IHRoZSBzYW1lIHRpbWUgb24gZGlmZmVyZW50IHRocmVhZHMuCiAgICAgICAg IC8vIFRvIG1ha2UgdGhpcyB3b3JrIHdlIHdpbGwgbmVlZCB0byBjaGFuZ2UgbV9hdXRvbWF0aWNJ bnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0SWRlbnRpZmllciB0byBiZSBhIHBlci10aHJlYWQgdmFs dWUuCiAgICAgICAgIC8vIE11bHRpcGxlIGF0dGVtcHRzIG9uIHRoZSBzYW1lIHRocmVhZCBzaG91 bGQgbm90IGJlIHBvc3NpYmxlIGJlY2F1c2Ugb3VyIG5lc3RlZCBydW4gbG9vcCBpcyBpbiBhIHNw ZWNpYWwgUldJIG1vZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvZ2xpYi9SZW1vdGVJbnNwZWN0b3JHbGliLmNwcAppbmRl eCA1YWZmOGIzZTNmZDdiNjBkMmM0YzZlOThiYzA1MGZhNzNiZjkwNDE3Li5kNzcxZmY3MmFmY2Jj NTUwYzg2Njc5ZGUyMWQzYTcwOTQzNjUxMWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVj dG9yR2xpYi5jcHAKQEAgLTI0MCwyOCArMjQwLDYgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnB1 c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwogfQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBk YXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KiB0 YXJnZXQpCi17Ci0gICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOwotCi0gICAgQVNTRVJUKHRh cmdldCk7Ci0gICAgYXV0byB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJZGVudGlm aWVyKCk7Ci0gICAgaWYgKCF0YXJnZXRJZGVudGlmaWVyKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFwLnNldCh0YXJnZXRJZGVudGlmaWVyLCB0YXJnZXQp OwotICAgIEFTU0VSVF9VTlVTRUQocmVzdWx0LCAhcmVzdWx0LmlzTmV3RW50cnkpOwotCi0gICAg Ly8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBhbGxvd2VkIHJlbW90ZSBjb250cm9sLCB0aGVuIHRo ZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4KLSAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBubyBp ZGVudGlmaWVyIHJlbW92ZSB0aGUgb2xkIGxpc3RpbmcuCi0gICAgaWYgKGF1dG8gdGFyZ2V0TGlz dGluZyA9IGxpc3RpbmdGb3JUYXJnZXQoKnRhcmdldCkpCi0gICAgICAgIG1fdGFyZ2V0TGlzdGlu Z01hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0TGlzdGluZyk7Ci0gICAgZWxzZQotICAg ICAgICBtX3RhcmdldExpc3RpbmdNYXAucmVtb3ZlKHRhcmdldElkZW50aWZpZXIpOwotICAgIC8v IEZJWE1FOiBJbXBsZW1lbnQgYXV0b21hdGljIGluc3BlY3Rpb24uCi0gICAgcHVzaExpc3Rpbmdz U29vbigpOwotfQotCiB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6c2VuZEF1dG9tYXRpY0luc3BlY3Rp b25DYW5kaWRhdGVNZXNzYWdlKCkKIHsKICAgICBBU1NFUlQobV9lbmFibGVkKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJ bnNwZWN0b3JTb2NrZXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1v dGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKaW5kZXggYjQzMWRmMGE3ZjRjMjNh YTg2NGU4YzdjZTYyNjU1ZTE1YjczZDgxNC4uNTM2ZDNjNzBhMGIyZTBmN2RjNDIzN2JjZjBmMGJl YWQzMmY1ZTBlYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5j cHAKQEAgLTE4NCwxMCArMTg0LDYgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnB1c2hMaXN0aW5n c1Nvb24oKQogICAgIH0pOwogfQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21h dGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KikKLXsKLX0KLQog dm9pZCBSZW1vdGVJbnNwZWN0b3I6OnNlbmRBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlTWVz c2FnZSgpCiB7CiB9Cg== 368737 2019-05-01 17:03:05 -0700 2019-05-01 17:25:52 -0700 Patch for landing bug-197439-20190501170303.patch text/plain 7909 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj NTRiZjM4Y2U2ODhiNDEzNjZkOGY2NjgwMjc3MjYzYzNjMjY3MTE2Li4zOTVmYTY0MGFhODI0OWIw ZTE0OTVhNGRlMTllOTUzYzdjMGFlNjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOS0wNS0wMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0 aW9uQ2FuZGlkYXRlIHNob3VsZCBoYXZlIGEgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzQzOQorCisgICAg ICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICBPbiBub24tQ29jb2EgcGxh dGZvcm1zLCBhdXRvbWF0aWMgaW5zcGVjdGlvbiBpcyBub3QgY3VycmVudGx5IGltcGxlbWVudGVk LAorICAgICAgICBzbyB1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlIGZhbGxzIGJh Y2sgdG8gdGhlIGxvZ2ljIG9mIHVwZGF0ZVRhcmdldC4KKyAgICAgICAgVGhpcyBsb2dpYyBhbHJl YWR5IGV4aXN0ZWQgaW4gdGhyZWUgcGxhY2VzLCBzbyByZWZhY3RvciBpdCBpbnRvIGEgY29tbW9u IHByaXZhdGUgbWV0aG9kCisgICAgICAgIGFuZCBhbGxvdyBvdXIgd2Vic29ja2V0LWJhc2VkIFJX SSBpbXBsZW1lbnRhdGlvbiB0byBtYWtlIHVzZSBvZiBpdCB0b28uCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OlJl bW90ZUluc3BlY3Rvcjo6dXBkYXRlVGFyZ2V0KToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3Rl SW5zcGVjdG9yOjp1cGRhdGVUYXJnZXRNYXApOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJ bnNwZWN0b3I6OnVwZGF0ZUF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGUpOgorICAgICAgICAq IGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmg6CisgICAgICAgICogaW5zcGVjdG9y L3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbToKKyAgICAgICAgKEluc3BlY3Rv cjo6UmVtb3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yR2xpYi5jcHA6 CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5z cGVjdGlvbkNhbmRpZGF0ZSk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9z b2NrZXQvUmVtb3RlSW5zcGVjdG9yU29ja2V0LmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVt b3RlSW5zcGVjdG9yOjp1cGRhdGVBdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlKTogRGVsZXRl ZC4KKwogMjAxOS0wNS0wMSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViS2l0IGhhcyB0b28gbXVjaCBvZiBpdHMgb3duIFVURi04IGNvZGUgYW5kIHNob3VsZCBy ZWx5IG1vcmUgb24gSUNVJ3MgVVRGLTggc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5jcHAKaW5kZXgg OWE2YTk2ZjI5MDZmODllZWI3OTZiZjIzYTA3ODE0MmMzMjI1MWYyZi4uZDM3ZDlmMDE4ZGFhZWFk MjQwMmY0YTQzMzVhYWI0M2FiZmUzNjMzOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuY3BwCkBAIC0xMDQs MTQgKzEwNCwyMiBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlVGFyZ2V0KFJlbW90ZUNv bnRyb2xsYWJsZVRhcmdldCogdGFyZ2V0KQogCiAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgp OwogCisgICAgaWYgKCF1cGRhdGVUYXJnZXRNYXAodGFyZ2V0KSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgcHVzaExpc3RpbmdzU29vbigpOworfQorCitib29sIFJlbW90ZUluc3BlY3Rvcjo6dXBk YXRlVGFyZ2V0TWFwKFJlbW90ZUNvbnRyb2xsYWJsZVRhcmdldCogdGFyZ2V0KQoreworICAgIEFT U0VSVChtX211dGV4LmlzTG9ja2VkKCkpOworCiAgICAgYXV0byB0YXJnZXRJZGVudGlmaWVyID0g dGFyZ2V0LT50YXJnZXRJZGVudGlmaWVyKCk7CiAgICAgaWYgKCF0YXJnZXRJZGVudGlmaWVyKQot ICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHsKLSAgICAgICAg YXV0byByZXN1bHQgPSBtX3RhcmdldE1hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0KTsK LSAgICAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsICFyZXN1bHQuaXNOZXdFbnRyeSk7Ci0gICAg fQorICAgIGF1dG8gcmVzdWx0ID0gbV90YXJnZXRNYXAuc2V0KHRhcmdldElkZW50aWZpZXIsIHRh cmdldCk7CisgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsICFyZXN1bHQuaXNOZXdFbnRyeSk7CiAK ICAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBqdXN0IGFsbG93ZWQgcmVtb3RlIGNvbnRyb2wsIHRo ZW4gdGhlIGxpc3Rpbmcgd29uJ3QgZXhpc3QgeWV0LgogICAgIC8vIElmIHRoZSB0YXJnZXQgaGFz IG5vIGlkZW50aWZpZXIgcmVtb3ZlIHRoZSBvbGQgbGlzdGluZy4KQEAgLTEyMCw4ICsxMjgsMTYg QEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnVwZGF0ZVRhcmdldChSZW1vdGVDb250cm9sbGFibGVU YXJnZXQqIHRhcmdldCkKICAgICBlbHNlCiAgICAgICAgIG1fdGFyZ2V0TGlzdGluZ01hcC5yZW1v dmUodGFyZ2V0SWRlbnRpZmllcik7CiAKLSAgICBwdXNoTGlzdGluZ3NTb29uKCk7CisgICAgcmV0 dXJuIHRydWU7Cit9CisKKyNpZiAhUExBVEZPUk0oQ09DT0EpCit2b2lkIFJlbW90ZUluc3BlY3Rv cjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFy Z2V0KiB0YXJnZXQpCit7CisgICAgLy8gRklYTUU6IEltcGxlbWVudCBhdXRvbWF0aWMgaW5zcGVj dGlvbi4KKyAgICB1cGRhdGVUYXJnZXQodGFyZ2V0KTsKIH0KKyNlbmRpZgogCiB2b2lkIFJlbW90 ZUluc3BlY3Rvcjo6dXBkYXRlQ2xpZW50Q2FwYWJpbGl0aWVzKCkKIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgK aW5kZXggNzFiN2NmNGVlNTc3ZDBiYjAyN2VjODllYzFiMzhiN2I1MDE0NmI0My4uM2NmOTNjMzFl NWQxMTcxODhkZGQ1ODJjOTlhYjU3YmE0ZGQ4OWY1MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKQEAgLTE4 MCw2ICsxODAsOCBAQCBwcml2YXRlOgogICAgIFRhcmdldExpc3RpbmcgbGlzdGluZ0Zvckluc3Bl Y3Rpb25UYXJnZXQoY29uc3QgUmVtb3RlSW5zcGVjdGlvblRhcmdldCYpIGNvbnN0OwogICAgIFRh cmdldExpc3RpbmcgbGlzdGluZ0ZvckF1dG9tYXRpb25UYXJnZXQoY29uc3QgUmVtb3RlQXV0b21h dGlvblRhcmdldCYpIGNvbnN0OwogCisgICAgYm9vbCB1cGRhdGVUYXJnZXRNYXAoUmVtb3RlQ29u dHJvbGxhYmxlVGFyZ2V0Kik7CisKICAgICB2b2lkIHB1c2hMaXN0aW5nc05vdygpOwogICAgIHZv aWQgcHVzaExpc3RpbmdzU29vbigpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbSBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNv Y29hLm1tCmluZGV4IDExNjY3YThiZDdhNzk0MTQxMDJmZGRkMzIyM2QzNzNiNTY1ZDQ5YWEuLjY2 NTI2NmI2ZjViNDQ5YTUzMzI3MGFmNGM1NGEzMzlmYjUyMGM1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNv Y29hLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29h L1JlbW90ZUluc3BlY3RvckNvY29hLm1tCkBAIC0xMjIsMjYgKzEyMiwxNyBAQCB2b2lkIFJlbW90 ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1vdGVJbnNw ZWN0aW9uVGFyZ2V0KgogICAgIHsKICAgICAgICAgTG9ja0hvbGRlciBsb2NrKG1fbXV0ZXgpOwog Ci0gICAgICAgIGF1dG8gdGFyZ2V0SWRlbnRpZmllciA9IHRhcmdldC0+dGFyZ2V0SWRlbnRpZmll cigpOwotICAgICAgICBpZiAoIXRhcmdldElkZW50aWZpZXIpCisgICAgICAgIGlmICghdXBkYXRl VGFyZ2V0TWFwKHRhcmdldCkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgYXV0byBy ZXN1bHQgPSBtX3RhcmdldE1hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwgdGFyZ2V0KTsKLSAgICAg ICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsICFyZXN1bHQuaXNOZXdFbnRyeSk7Ci0KLSAgICAgICAg Ly8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBhbGxvd2VkIHJlbW90ZSBjb250cm9sLCB0aGVuIHRo ZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4KLSAgICAgICAgLy8gSWYgdGhlIHRhcmdldCBoYXMg bm8gaWRlbnRpZmllciByZW1vdmUgdGhlIG9sZCBsaXN0aW5nLgotICAgICAgICBpZiAoUmV0YWlu UHRyPE5TRGljdGlvbmFyeT4gdGFyZ2V0TGlzdGluZyA9IGxpc3RpbmdGb3JUYXJnZXQoKnRhcmdl dCkpCi0gICAgICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAuc2V0KHRhcmdldElkZW50aWZpZXIs IHRhcmdldExpc3RpbmcpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3RhcmdldExpc3Rp bmdNYXAucmVtb3ZlKHRhcmdldElkZW50aWZpZXIpOwotCiAgICAgICAgIC8vIERvbid0IGFsbG93 IGF1dG9tYXRpYyBpbnNwZWN0aW9uIHVubGVzcyBpdCBpcyBhbGxvd2VkIG9yIHdlIGFyZSBzdG9w cGVkLgogICAgICAgICBpZiAoIW1fYXV0b21hdGljSW5zcGVjdGlvbkVuYWJsZWQgfHwgIW1fZW5h YmxlZCkgewogICAgICAgICAgICAgcHVzaExpc3RpbmdzU29vbigpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAKKyAgICAgICAgYXV0byB0YXJnZXRJZGVudGlmaWVyID0gdGFyZ2V0 LT50YXJnZXRJZGVudGlmaWVyKCk7CisKICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBoYW5k bGUgbXVsdGlwbGUgZGVidWdnYWJsZXMgdHJ5aW5nIHRvIHBhdXNlIGF0IHRoZSBzYW1lIHRpbWUg b24gZGlmZmVyZW50IHRocmVhZHMuCiAgICAgICAgIC8vIFRvIG1ha2UgdGhpcyB3b3JrIHdlIHdp bGwgbmVlZCB0byBjaGFuZ2UgbV9hdXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlVGFyZ2V0SWRl bnRpZmllciB0byBiZSBhIHBlci10aHJlYWQgdmFsdWUuCiAgICAgICAgIC8vIE11bHRpcGxlIGF0 dGVtcHRzIG9uIHRoZSBzYW1lIHRocmVhZCBzaG91bGQgbm90IGJlIHBvc3NpYmxlIGJlY2F1c2Ug b3VyIG5lc3RlZCBydW4gbG9vcCBpcyBpbiBhIHNwZWNpYWwgUldJIG1vZGUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3Bl Y3RvckdsaWIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvZ2xp Yi9SZW1vdGVJbnNwZWN0b3JHbGliLmNwcAppbmRleCA1YWZmOGIzZTNmZDdiNjBkMmM0YzZlOThi YzA1MGZhNzNiZjkwNDE3Li5kNzcxZmY3MmFmY2JjNTUwYzg2Njc5ZGUyMWQzYTcwOTQzNjUxMWUz IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGli L1JlbW90ZUluc3BlY3RvckdsaWIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvcmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yR2xpYi5jcHAKQEAgLTI0MCwyOCArMjQw LDYgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwog fQogCi12b2lkIFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRp ZGF0ZShSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0KiB0YXJnZXQpCi17Ci0gICAgTG9ja0hvbGRlciBs b2NrKG1fbXV0ZXgpOwotCi0gICAgQVNTRVJUKHRhcmdldCk7Ci0gICAgYXV0byB0YXJnZXRJZGVu dGlmaWVyID0gdGFyZ2V0LT50YXJnZXRJZGVudGlmaWVyKCk7Ci0gICAgaWYgKCF0YXJnZXRJZGVu dGlmaWVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRvIHJlc3VsdCA9IG1fdGFyZ2V0TWFw LnNldCh0YXJnZXRJZGVudGlmaWVyLCB0YXJnZXQpOwotICAgIEFTU0VSVF9VTlVTRUQocmVzdWx0 LCAhcmVzdWx0LmlzTmV3RW50cnkpOwotCi0gICAgLy8gSWYgdGhlIHRhcmdldCBoYXMganVzdCBh bGxvd2VkIHJlbW90ZSBjb250cm9sLCB0aGVuIHRoZSBsaXN0aW5nIHdvbid0IGV4aXN0IHlldC4K LSAgICAvLyBJZiB0aGUgdGFyZ2V0IGhhcyBubyBpZGVudGlmaWVyIHJlbW92ZSB0aGUgb2xkIGxp c3RpbmcuCi0gICAgaWYgKGF1dG8gdGFyZ2V0TGlzdGluZyA9IGxpc3RpbmdGb3JUYXJnZXQoKnRh cmdldCkpCi0gICAgICAgIG1fdGFyZ2V0TGlzdGluZ01hcC5zZXQodGFyZ2V0SWRlbnRpZmllciwg dGFyZ2V0TGlzdGluZyk7Ci0gICAgZWxzZQotICAgICAgICBtX3RhcmdldExpc3RpbmdNYXAucmVt b3ZlKHRhcmdldElkZW50aWZpZXIpOwotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgYXV0b21hdGlj IGluc3BlY3Rpb24uCi0gICAgcHVzaExpc3RpbmdzU29vbigpOwotfQotCiB2b2lkIFJlbW90ZUlu c3BlY3Rvcjo6c2VuZEF1dG9tYXRpY0luc3BlY3Rpb25DYW5kaWRhdGVNZXNzYWdlKCkKIHsKICAg ICBBU1NFUlQobV9lbmFibGVkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL3NvY2tldC9SZW1vdGVJbnNwZWN0b3JTb2NrZXQuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3RvclNv Y2tldC5jcHAKaW5kZXggYjQzMWRmMGE3ZjRjMjNhYTg2NGU4YzdjZTYyNjU1ZTE1YjczZDgxNC4u NTM2ZDNjNzBhMGIyZTBmN2RjNDIzN2JjZjBmMGJlYWQzMmY1ZTBlYyAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvc29ja2V0L1JlbW90ZUluc3BlY3Rv clNvY2tldC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUv c29ja2V0L1JlbW90ZUluc3BlY3RvclNvY2tldC5jcHAKQEAgLTE4NCwxMCArMTg0LDYgQEAgdm9p ZCBSZW1vdGVJbnNwZWN0b3I6OnB1c2hMaXN0aW5nc1Nvb24oKQogICAgIH0pOwogfQogCi12b2lk IFJlbW90ZUluc3BlY3Rvcjo6dXBkYXRlQXV0b21hdGljSW5zcGVjdGlvbkNhbmRpZGF0ZShSZW1v dGVJbnNwZWN0aW9uVGFyZ2V0KikKLXsKLX0KLQogdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnNlbmRB dXRvbWF0aWNJbnNwZWN0aW9uQ2FuZGlkYXRlTWVzc2FnZSgpCiB7CiB9Cg==