176552 2017-09-07 12:05:14 -0700 [Curl] Bug fix for synchronous transfer 2017-09-27 12:21:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Windows 10 RESOLVED FIXED P2 Normal --- 1 basuke basuke achristensen basuke bfulgham buildbot commit-queue don.olmstead galpeter webkit-bug-importer oldest_to_newest 1346464 0 basuke 2017-09-07 12:05:14 -0700 ResourceHandleInternal::m_delegate is null when synchronous transfer invokes. It should be set to an instance of ResourceHandleCurlDelegate. Also the callbacks to be called when transfer complete is wrong. 1346627 1 320201 basuke 2017-09-07 16:12:50 -0700 Created attachment 320201 fix 1346629 2 buildbot 2017-09-07 16:15:10 -0700 Attachment 320201 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:11: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1346638 3 320204 basuke 2017-09-07 16:29:54 -0700 Created attachment 320204 fix2 1346639 4 buildbot 2017-09-07 16:32:43 -0700 Attachment 320204 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:11: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1346640 5 320205 basuke 2017-09-07 16:35:40 -0700 Created attachment 320205 fix3 1348553 6 320205 commit-queue 2017-09-13 16:33:59 -0700 Comment on attachment 320205 fix3 Clearing flags on attachment: 320205 Committed r221999: <http://trac.webkit.org/changeset/221999> 1348554 7 commit-queue 2017-09-13 16:34:01 -0700 All reviewed patches have been landed. Closing bug. 320201 2017-09-07 16:12:50 -0700 2017-09-07 16:29:54 -0700 fix 176552-01.diff text/plain 8963 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2I0NWM1ZmI4YS4uNTM0YzBmNDQ0NzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0wOS0wNyAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEJ1ZyBmaXggZm9yIHN5bmNocm9ub3VzIHRyYW5zZmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY1NTIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNvdXJj ZUhhbmRsZUludGVybmFsOjptX2RlbGVnYXRlIGlzIG51bGwgd2hlbiB0cmFuc2ZlciBpcyBzeW5j aHJvbm91cy4gSXQgc2hvdWxkIGJlIHNldCBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS4KKyAg ICAgICAgQWxzbyB0aGUgY2FsbGJhY2sgZnVuY3Rpb25zIGNhbGxlZCB3aGVuIHRyYW5zZmVyIGlz IGNvbXBsZXRlZCBpcyB3cm9uZy4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtTG9hZFJlc291cmNlU3lu Y2hyb25vdXNseSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFu ZGxlQ3VybERlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3Vy bERlbGVnYXRlOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpub3RpZnlGaW5pc2gpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZhaWwpOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJlY2VpdmVIZWFkZXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJlY2VpdmVEYXRh KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjp3aWxsU2Vu ZERhdGEpOgorCiAyMDE3LTA5LTA2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBTdXBwb3J0IGNhY2hpbmcgb2YgUmVzcG9uc2Ugd2l0aCBhIFJlYWRhYmxlU3Ry ZWFtIGJvZHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAKaW5kZXggM2UxYjNiMGRjY2EuLmRiOWQ1M2Fl OTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVz b3VyY2VIYW5kbGVDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcApAQCAtMjMwLDggKzIzMCw2IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2hhbGxlbmdlUmVqZWN0aW9uKGNvbnN0IEF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlJikKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotLy8gc3luYyBs b2FkZXIKLQogdm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1Mb2FkUmVzb3VyY2VTeW5jaHJv bm91c2x5KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0LCBjb25zdCBSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QsIFN0b3JlZENyZWRlbnRpYWxzLCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3Vy Y2VSZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKIHsKICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOwpAQCAtMjM5LDYgKzIzNyw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6 OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hyb25vdXNseShOZXR3b3JraW5nQ29udGV4dCogY29u dGV4CiAgICAgU3luY2hyb25vdXNMb2FkZXJDbGllbnQgY2xpZW50OwogICAgIFJlZlB0cjxSZXNv dXJjZUhhbmRsZT4gaGFuZGxlID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFuZGxlKGNvbnRleHQs IHJlcXVlc3QsICZjbGllbnQsIGZhbHNlLCBmYWxzZSkpOwogCisgICAgaGFuZGxlLT5kLT5tX2Rl bGVnYXRlID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlKGhhbmRsZS5n ZXQoKSkpOwogICAgIGhhbmRsZS0+ZC0+bV9kZWxlZ2F0ZS0+ZGlzcGF0Y2hTeW5jaHJvbm91c0pv YigpOwogCiAgICAgZXJyb3IgPSBjbGllbnQuZXJyb3IoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVD dXJsRGVsZWdhdGUuY3BwCmluZGV4IDIwZWU5ZjEyNzc2Li4xMWMxY2MxODVkYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3Vy bERlbGVnYXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuY3BwCkBAIC0xNzEsMTggKzE3MSwxMCBAQCB2b2lk IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKCkKICAg ICBtX2N1cmxIYW5kbGUuZ2V0VGltZXMocHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBj b25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWUpOwogICAgIHNldFdlYlRpbWluZ3MocHJldHJhbnNm ZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWUpOwogCi0g ICAgaWYgKG1faGFuZGxlLT5jbGllbnQoKSkgewotICAgICAgICBpZiAocmV0ICE9IENVUkxFX09L KSB7Ci0gICAgICAgICAgICBTdHJpbmcgZG9tYWluID0gQ3VybENvbnRleHQ6OmVycm9yRG9tYWlu OwotICAgICAgICAgICAgaW50IGVycm9yQ29kZSA9IG1fY3VybEhhbmRsZS5lcnJvckNvZGUoKTsK LSAgICAgICAgICAgIFVSTCBmYWlsaW5nVVJMID0gbV9jdXJsSGFuZGxlLmdldEVmZmVjdGl2ZVVS TCgpOwotICAgICAgICAgICAgU3RyaW5nIGVycm9yRGVzY3JpcHRpb24gPSBtX2N1cmxIYW5kbGUu ZXJyb3JEZXNjcmlwdGlvbigpOwotICAgICAgICAgICAgdW5zaWduZWQgc3NsRXJyb3JzID0gbV9j dXJsSGFuZGxlLmdldFNzbEVycm9ycygpOwotCi0gICAgICAgICAgICBtX2hhbmRsZS0+Y2xpZW50 KCktPmRpZEZhaWwobV9oYW5kbGUsIFJlc291cmNlRXJyb3IoZG9tYWluLCBlcnJvckNvZGUsIGZh aWxpbmdVUkwsIGVycm9yRGVzY3JpcHRpb24sIHNzbEVycm9ycykpOwotICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIG1faGFuZGxlLT5jbGllbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKG1faGFu ZGxlLCBSZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNlKCkpKTsKLSAgICB9CisgICAgaWYgKHJldCAh PSBDVVJMRV9PSykKKyAgICAgICAgbm90aWZ5RmFpbCgpOworICAgIGVsc2UKKyAgICAgICAgbm90 aWZ5RmluaXNoKCk7CiB9CiAKIHZvaWQgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OnJldGFp bigpCkBAIC0yOTEsMTEgKzI4MywxNSBAQCB2b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRl Ojpub3RpZnlGaW5pc2goKQogCiAgICAgbV9jdXJsSGFuZGxlLmdldFRpbWVzKHByZXRyYW5zZmVy VGltZSwgZG5zTG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5lY3RUaW1lKTsKIAotICAg IGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJldHJh bnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWVdIHsK LSAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmluaXNoKHByZXRyYW5zZmVyVGltZSwgZG5z TG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5lY3RUaW1lKTsKLSAgICB9KTsKKyAgICBp ZiAoaXNNYWluVGhyZWFkKCkpCisgICAgICAgIGRpZEZpbmlzaChwcmV0cmFuc2ZlclRpbWUsIGRu c0xvb2t1cFRpbWUsIGNvbm5lY3RUaW1lLCBhcHBDb25uZWN0VGltZSk7CisgICAgZWxzZSB7Cisg ICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwg cHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRp bWVdIHsKKyAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmluaXNoKHBy ZXRyYW5zZmVyVGltZSwgZG5zTG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5lY3RUaW1l KTsKKyAgICAgICAgfSk7CisgICAgfQogfQogCiB2b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVn YXRlOjpub3RpZnlGYWlsKCkKQEAgLTMwNiwxMSArMzAyLDE1IEBAIHZvaWQgUmVzb3VyY2VIYW5k bGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZhaWwoKQogICAgIFN0cmluZyBlcnJvckRlc2NyaXB0aW9u ID0gbV9jdXJsSGFuZGxlLmVycm9yRGVzY3JpcHRpb24oKTsKICAgICB1bnNpZ25lZCBzc2xFcnJv cnMgPSBtX2N1cmxIYW5kbGUuZ2V0U3NsRXJyb3JzKCk7CiAKLSAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRvbWFpbiA9IGRvbWFpbi5pc29sYXRl ZENvcHkoKSwgZXJyb3JDb2RlLCBmYWlsaW5nVVJMID0gZmFpbGluZ1VSTC5pc29sYXRlZENvcHko KSwgZXJyb3JEZXNjcmlwdGlvbiA9IGVycm9yRGVzY3JpcHRpb24uaXNvbGF0ZWRDb3B5KCksIHNz bEVycm9yc10gewotICAgICAgICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBwcm90ZWN0ZWRUaGlzLT5kaWRGYWlsKGRvbWFpbiwgZXJy b3JDb2RlLCBmYWlsaW5nVVJMLCBlcnJvckRlc2NyaXB0aW9uLCBzc2xFcnJvcnMpOwotICAgIH0p OworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgZGlkRmFpbChkb21haW4sIGVycm9y Q29kZSwgZmFpbGluZ1VSTCwgZXJyb3JEZXNjcmlwdGlvbiwgc3NsRXJyb3JzKTsKKyAgICBlbHNl IHsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBkb21haW4gPSBkb21haW4uaXNvbGF0ZWRDb3B5KCksIGVycm9yQ29kZSwgZmFpbGluZ1VS TCA9IGZhaWxpbmdVUkwuaXNvbGF0ZWRDb3B5KCksIGVycm9yRGVzY3JpcHRpb24gPSBlcnJvckRl c2NyaXB0aW9uLmlzb2xhdGVkQ29weSgpLCBzc2xFcnJvcnNdIHsKKyAgICAgICAgICAgIGlmICgh cHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbChkb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VS TCwgZXJyb3JEZXNjcmlwdGlvbiwgc3NsRXJyb3JzKTsKKyAgICAgICAgfSk7CisgICAgfQogfQog CiBSZXNvdXJjZVJlc3BvbnNlJiBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZTo6cmVzcG9uc2Uo KQpAQCAtODY4LDE3ICs4NjgsMjUgQEAgc2l6ZV90IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRl OjpkaWRSZWNlaXZlSGVhZGVyKFN0cmluZyYmIGhlYWRlcikKICAgICAgICAgbG9uZyBsb25nIGNv bnRlbnRMZW5ndGggPSAwOwogICAgICAgICBtX2N1cmxIYW5kbGUuZ2V0Q29udGVudExlbmdodERv d25sb2FkKGNvbnRlbnRMZW5ndGgpOwogCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgaHR0cENvZGUsIGNvbnRlbnRMZW5ndGhdIHsKLSAg ICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCi0gICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUFsbEhlYWRlcnMo aHR0cENvZGUsIGNvbnRlbnRMZW5ndGgpOwotICAgICAgICB9KTsKKyAgICAgICAgaWYgKGlzTWFp blRocmVhZCgpKQorICAgICAgICAgICAgZGlkUmVjZWl2ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNv bnRlbnRMZW5ndGgpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJl YWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgaHR0cENvZGUsIGNvbnRlbnRMZW5n dGhdIHsKKyAgICAgICAgICAgICAgICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ ZGlkUmVjZWl2ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNvbnRlbnRMZW5ndGgpOworICAgICAgICAg ICAgfSk7CisgICAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGhlYWRlciA9IGhlYWRlci5pc29sYXRl ZENvcHkoKSBdIHsKLSAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVj ZWl2ZUhlYWRlckxpbmUoaGVhZGVyKTsKLSAgICAgICAgfSk7CisgICAgICAgIGlmIChpc01haW5U aHJlYWQoKSkKKyAgICAgICAgICAgIGRpZFJlY2VpdmVIZWFkZXJMaW5lKGhlYWRlcik7CisgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBoZWFkZXIgPSBoZWFkZXIuaXNvbGF0ZWRDb3B5KCkgXSB7CisgICAg ICAgICAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmRpZFJlY2VpdmVI ZWFkZXJMaW5lKGhlYWRlcik7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQogICAgIH0KIAog ICAgIHJldHVybiBoZWFkZXIubGVuZ3RoKCk7CkBAIC05MDQsMTEgKzkxMiwxNSBAQCBzaXplX3Qg UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJlY2VpdmVEYXRhKFRocmVhZFNhZmVEYXRh QnVmZmVyIGRhdGEpCiAgICAgaWYgKCFkYXRhLnNpemUoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRh dGFdIHsKLSAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUNvbnRlbnREYXRhKGRh dGEpOwotICAgIH0pOworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgZGlkUmVjZWl2 ZUNvbnRlbnREYXRhKGRhdGEpOworICAgIGVsc2UgeworICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRhdGFdIHsKKyAgICAgICAgICAgIGlm ICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUNvbnRlbnREYXRhKGRhdGEpOworICAg ICAgICB9KTsKKyAgICB9CiAKICAgICByZXR1cm4gZGF0YS5zaXplKCk7CiB9CkBAIC05MzUsMTUg Kzk0NywxOSBAQCBzaXplX3QgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OndpbGxTZW5kRGF0 YShjaGFyKiBidWZmZXIsIHNpemVfdCBibG9ja1NpemUsCiAKICAgICAgICAgbV9zZW5kQnl0ZXMg PSAwOwogCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgYnVmZmVyLCBibG9ja1NpemUsIG51bWJlck9mQmxvY2tzXSB7Ci0gICAgICAgICAg ICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQotICAgICAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPnByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJsb2Nr U2l6ZSwgbnVtYmVyT2ZCbG9ja3MpOwotICAgICAgICB9KTsKLQotICAgICAgICBtX3dvcmtlclRo cmVhZENvbmRpdGlvblZhcmlhYmxlLndhaXQobG9jaywgW3RoaXNdIHsKLSAgICAgICAgICAgIHJl dHVybiBtX3NlbmRCeXRlczsKLSAgICAgICAgfSk7CisgICAgICAgIGlmIChpc01haW5UaHJlYWQo KSkKKyAgICAgICAgICAgIHByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJsb2NrU2l6ZSwgbnVtYmVy T2ZCbG9ja3MpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQo W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgYnVmZmVyLCBibG9ja1NpemUsIG51bWJl ck9mQmxvY2tzXSB7CisgICAgICAgICAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRs ZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHByb3RlY3Rl ZFRoaXMtPnByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJsb2NrU2l6ZSwgbnVtYmVyT2ZCbG9ja3Mp OworICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgIG1fd29ya2VyVGhyZWFkQ29uZGl0aW9u VmFyaWFibGUud2FpdChsb2NrLCBbdGhpc10geworICAgICAgICAgICAgICAgIHJldHVybiBtX3Nl bmRCeXRlczsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJu IG1fc2VuZEJ5dGVzOwo= 320204 2017-09-07 16:29:54 -0700 2017-09-07 16:35:40 -0700 fix2 176552-01.diff text/plain 8963 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2I0NWM1ZmI4YS4uNTM0YzBmNDQ0NzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0wOS0wNyAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEJ1ZyBmaXggZm9yIHN5bmNocm9ub3VzIHRyYW5zZmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY1NTIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNvdXJj ZUhhbmRsZUludGVybmFsOjptX2RlbGVnYXRlIGlzIG51bGwgd2hlbiB0cmFuc2ZlciBpcyBzeW5j aHJvbm91cy4gSXQgc2hvdWxkIGJlIHNldCBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS4KKyAg ICAgICAgQWxzbyB0aGUgY2FsbGJhY2sgZnVuY3Rpb25zIGNhbGxlZCB3aGVuIHRyYW5zZmVyIGlz IGNvbXBsZXRlZCBpcyB3cm9uZy4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtTG9hZFJlc291cmNlU3lu Y2hyb25vdXNseSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFu ZGxlQ3VybERlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3Vy bERlbGVnYXRlOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpub3RpZnlGaW5pc2gpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZhaWwpOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJlY2VpdmVIZWFkZXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJlY2VpdmVEYXRh KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjp3aWxsU2Vu ZERhdGEpOgorCiAyMDE3LTA5LTA2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBTdXBwb3J0IGNhY2hpbmcgb2YgUmVzcG9uc2Ugd2l0aCBhIFJlYWRhYmxlU3Ry ZWFtIGJvZHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAKaW5kZXggM2UxYjNiMGRjY2EuLmRiOWQ1M2Fl OTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVz b3VyY2VIYW5kbGVDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcApAQCAtMjMwLDggKzIzMCw2IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2hhbGxlbmdlUmVqZWN0aW9uKGNvbnN0IEF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlJikKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotLy8gc3luYyBs b2FkZXIKLQogdm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1Mb2FkUmVzb3VyY2VTeW5jaHJv bm91c2x5KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0LCBjb25zdCBSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QsIFN0b3JlZENyZWRlbnRpYWxzLCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3Vy Y2VSZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKIHsKICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOwpAQCAtMjM5LDYgKzIzNyw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6 OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hyb25vdXNseShOZXR3b3JraW5nQ29udGV4dCogY29u dGV4CiAgICAgU3luY2hyb25vdXNMb2FkZXJDbGllbnQgY2xpZW50OwogICAgIFJlZlB0cjxSZXNv dXJjZUhhbmRsZT4gaGFuZGxlID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFuZGxlKGNvbnRleHQs IHJlcXVlc3QsICZjbGllbnQsIGZhbHNlLCBmYWxzZSkpOwogCisgICAgaGFuZGxlLT5kLT5tX2Rl bGVnYXRlID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlKGhhbmRsZS5n ZXQoKSkpOwogICAgIGhhbmRsZS0+ZC0+bV9kZWxlZ2F0ZS0+ZGlzcGF0Y2hTeW5jaHJvbm91c0pv YigpOwogCiAgICAgZXJyb3IgPSBjbGllbnQuZXJyb3IoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVD dXJsRGVsZWdhdGUuY3BwCmluZGV4IDIwZWU5ZjEyNzc2Li4xMWMxY2MxODVkYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3Vy bERlbGVnYXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuY3BwCkBAIC0xNzEsMTggKzE3MSwxMCBAQCB2b2lk IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKCkKICAg ICBtX2N1cmxIYW5kbGUuZ2V0VGltZXMocHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBj b25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWUpOwogICAgIHNldFdlYlRpbWluZ3MocHJldHJhbnNm ZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWUpOwogCi0g ICAgaWYgKG1faGFuZGxlLT5jbGllbnQoKSkgewotICAgICAgICBpZiAocmV0ICE9IENVUkxFX09L KSB7Ci0gICAgICAgICAgICBTdHJpbmcgZG9tYWluID0gQ3VybENvbnRleHQ6OmVycm9yRG9tYWlu OwotICAgICAgICAgICAgaW50IGVycm9yQ29kZSA9IG1fY3VybEhhbmRsZS5lcnJvckNvZGUoKTsK LSAgICAgICAgICAgIFVSTCBmYWlsaW5nVVJMID0gbV9jdXJsSGFuZGxlLmdldEVmZmVjdGl2ZVVS TCgpOwotICAgICAgICAgICAgU3RyaW5nIGVycm9yRGVzY3JpcHRpb24gPSBtX2N1cmxIYW5kbGUu ZXJyb3JEZXNjcmlwdGlvbigpOwotICAgICAgICAgICAgdW5zaWduZWQgc3NsRXJyb3JzID0gbV9j dXJsSGFuZGxlLmdldFNzbEVycm9ycygpOwotCi0gICAgICAgICAgICBtX2hhbmRsZS0+Y2xpZW50 KCktPmRpZEZhaWwobV9oYW5kbGUsIFJlc291cmNlRXJyb3IoZG9tYWluLCBlcnJvckNvZGUsIGZh aWxpbmdVUkwsIGVycm9yRGVzY3JpcHRpb24sIHNzbEVycm9ycykpOwotICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIG1faGFuZGxlLT5jbGllbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKG1faGFu ZGxlLCBSZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNlKCkpKTsKLSAgICB9CisgICAgaWYgKHJldCAh PSBDVVJMRV9PSykKKyAgICAgICAgbm90aWZ5RmFpbCgpOworICAgIGVsc2UKKyAgICAgICAgbm90 aWZ5RmluaXNoKCk7CiB9CiAKIHZvaWQgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OnJldGFp bigpCkBAIC0yOTEsMTEgKzI4MywxNSBAQCB2b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRl Ojpub3RpZnlGaW5pc2goKQogCiAgICAgbV9jdXJsSGFuZGxlLmdldFRpbWVzKHByZXRyYW5zZmVy VGltZSwgZG5zTG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5lY3RUaW1lKTsKIAotICAg IGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJldHJh bnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWVdIHsK LSAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmluaXNoKHByZXRyYW5zZmVyVGltZSwgZG5z TG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5lY3RUaW1lKTsKLSAgICB9KTsKKyAgICBp ZiAoaXNNYWluVGhyZWFkKCkpCisgICAgICAgIGRpZEZpbmlzaChwcmV0cmFuc2ZlclRpbWUsIGRu c0xvb2t1cFRpbWUsIGNvbm5lY3RUaW1lLCBhcHBDb25uZWN0VGltZSk7CisgICAgZWxzZSB7Cisg ICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwg cHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRp bWVdIHsKKyAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmluaXNoKHBy ZXRyYW5zZmVyVGltZSwgZG5zTG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5lY3RUaW1l KTsKKyAgICAgICAgfSk7CisgICAgfQogfQogCiB2b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVn YXRlOjpub3RpZnlGYWlsKCkKQEAgLTMwNiwxMSArMzAyLDE1IEBAIHZvaWQgUmVzb3VyY2VIYW5k bGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZhaWwoKQogICAgIFN0cmluZyBlcnJvckRlc2NyaXB0aW9u ID0gbV9jdXJsSGFuZGxlLmVycm9yRGVzY3JpcHRpb24oKTsKICAgICB1bnNpZ25lZCBzc2xFcnJv cnMgPSBtX2N1cmxIYW5kbGUuZ2V0U3NsRXJyb3JzKCk7CiAKLSAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRvbWFpbiA9IGRvbWFpbi5pc29sYXRl ZENvcHkoKSwgZXJyb3JDb2RlLCBmYWlsaW5nVVJMID0gZmFpbGluZ1VSTC5pc29sYXRlZENvcHko KSwgZXJyb3JEZXNjcmlwdGlvbiA9IGVycm9yRGVzY3JpcHRpb24uaXNvbGF0ZWRDb3B5KCksIHNz bEVycm9yc10gewotICAgICAgICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBwcm90ZWN0ZWRUaGlzLT5kaWRGYWlsKGRvbWFpbiwgZXJy b3JDb2RlLCBmYWlsaW5nVVJMLCBlcnJvckRlc2NyaXB0aW9uLCBzc2xFcnJvcnMpOwotICAgIH0p OworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgZGlkRmFpbChkb21haW4sIGVycm9y Q29kZSwgZmFpbGluZ1VSTCwgZXJyb3JEZXNjcmlwdGlvbiwgc3NsRXJyb3JzKTsKKyAgICBlbHNl IHsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBkb21haW4gPSBkb21haW4uaXNvbGF0ZWRDb3B5KCksIGVycm9yQ29kZSwgZmFpbGluZ1VS TCA9IGZhaWxpbmdVUkwuaXNvbGF0ZWRDb3B5KCksIGVycm9yRGVzY3JpcHRpb24gPSBlcnJvckRl c2NyaXB0aW9uLmlzb2xhdGVkQ29weSgpLCBzc2xFcnJvcnNdIHsKKyAgICAgICAgICAgIGlmICgh cHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbChkb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VS TCwgZXJyb3JEZXNjcmlwdGlvbiwgc3NsRXJyb3JzKTsKKyAgICAgICAgfSk7CisgICAgfQogfQog CiBSZXNvdXJjZVJlc3BvbnNlJiBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZTo6cmVzcG9uc2Uo KQpAQCAtODY4LDE3ICs4NjgsMjUgQEAgc2l6ZV90IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRl OjpkaWRSZWNlaXZlSGVhZGVyKFN0cmluZyYmIGhlYWRlcikKICAgICAgICAgbG9uZyBsb25nIGNv bnRlbnRMZW5ndGggPSAwOwogICAgICAgICBtX2N1cmxIYW5kbGUuZ2V0Q29udGVudExlbmdodERv d25sb2FkKGNvbnRlbnRMZW5ndGgpOwogCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgaHR0cENvZGUsIGNvbnRlbnRMZW5ndGhdIHsKLSAg ICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCi0gICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUFsbEhlYWRlcnMo aHR0cENvZGUsIGNvbnRlbnRMZW5ndGgpOwotICAgICAgICB9KTsKKyAgICAgICAgaWYgKGlzTWFp blRocmVhZCgpKQorICAgICAgICAgICAgZGlkUmVjZWl2ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNv bnRlbnRMZW5ndGgpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJl YWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgaHR0cENvZGUsIGNvbnRlbnRMZW5n dGhdIHsKKyAgICAgICAgICAgICAgICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ ZGlkUmVjZWl2ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNvbnRlbnRMZW5ndGgpOworICAgICAgICAg ICAgfSk7CisgICAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGhlYWRlciA9IGhlYWRlci5pc29sYXRl ZENvcHkoKSBdIHsKLSAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVj ZWl2ZUhlYWRlckxpbmUoaGVhZGVyKTsKLSAgICAgICAgfSk7CisgICAgICAgIGlmIChpc01haW5U aHJlYWQoKSkKKyAgICAgICAgICAgIGRpZFJlY2VpdmVIZWFkZXJMaW5lKGhlYWRlcik7CisgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBoZWFkZXIgPSBoZWFkZXIuaXNvbGF0ZWRDb3B5KCkgXSB7CisgICAg ICAgICAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmRpZFJlY2VpdmVI ZWFkZXJMaW5lKGhlYWRlcik7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQogICAgIH0KIAog ICAgIHJldHVybiBoZWFkZXIubGVuZ3RoKCk7CkBAIC05MDQsMTEgKzkxMiwxNSBAQCBzaXplX3Qg UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJlY2VpdmVEYXRhKFRocmVhZFNhZmVEYXRh QnVmZmVyIGRhdGEpCiAgICAgaWYgKCFkYXRhLnNpemUoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRh dGFdIHsKLSAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUNvbnRlbnREYXRhKGRh dGEpOwotICAgIH0pOworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgZGlkUmVjZWl2 ZUNvbnRlbnREYXRhKGRhdGEpOworICAgIGVsc2UgeworICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRhdGFdIHsKKyAgICAgICAgICAgIGlm ICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUNvbnRlbnREYXRhKGRhdGEpOworICAg ICAgICB9KTsKKyAgICB9CiAKICAgICByZXR1cm4gZGF0YS5zaXplKCk7CiB9CkBAIC05MzUsMTUg Kzk0NywxOSBAQCBzaXplX3QgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OndpbGxTZW5kRGF0 YShjaGFyKiBidWZmZXIsIHNpemVfdCBibG9ja1NpemUsCiAKICAgICAgICAgbV9zZW5kQnl0ZXMg PSAwOwogCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgYnVmZmVyLCBibG9ja1NpemUsIG51bWJlck9mQmxvY2tzXSB7Ci0gICAgICAgICAg ICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQotICAgICAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPnByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJsb2Nr U2l6ZSwgbnVtYmVyT2ZCbG9ja3MpOwotICAgICAgICB9KTsKLQotICAgICAgICBtX3dvcmtlclRo cmVhZENvbmRpdGlvblZhcmlhYmxlLndhaXQobG9jaywgW3RoaXNdIHsKLSAgICAgICAgICAgIHJl dHVybiBtX3NlbmRCeXRlczsKLSAgICAgICAgfSk7CisgICAgICAgIGlmIChpc01haW5UaHJlYWQo KSkKKyAgICAgICAgICAgIHByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJsb2NrU2l6ZSwgbnVtYmVy T2ZCbG9ja3MpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQo W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgYnVmZmVyLCBibG9ja1NpemUsIG51bWJl ck9mQmxvY2tzXSB7CisgICAgICAgICAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRs ZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHByb3RlY3Rl ZFRoaXMtPnByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJsb2NrU2l6ZSwgbnVtYmVyT2ZCbG9ja3Mp OworICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgIG1fd29ya2VyVGhyZWFkQ29uZGl0aW9u VmFyaWFibGUud2FpdChsb2NrLCBbdGhpc10geworICAgICAgICAgICAgICAgIHJldHVybiBtX3Nl bmRCeXRlczsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJu IG1fc2VuZEJ5dGVzOwo= 320205 2017-09-07 16:35:40 -0700 2017-09-13 16:33:59 -0700 fix3 176552-02.diff text/plain 8930 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2I0NWM1ZmI4YS4uYmZjYzJkNDUwYmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNy0wOS0wNyAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEJ1ZyBmaXggZm9yIHN5bmNocm9ub3VzIHRyYW5zZmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY1NTIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNvdXJj ZUhhbmRsZUludGVybmFsOjptX2RlbGVnYXRlIGlzIG51bGwgd2hlbiB0cmFuc2ZlciBpcyBzeW5j aHJvbm91cy4gSXQgc2hvdWxkIGJlIHNldCBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS4KKyAg ICAgICAgQWxzbyB0aGUgY2FsbGJhY2sgZnVuY3Rpb25zIGNhbGxlZCB3aGVuIHRyYW5zZmVyIGlz IGNvbXBsZXRlZCBpcyB3cm9uZy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9S ZXNvdXJjZUhhbmRsZUN1cmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6 OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9i KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpub3RpZnlG aW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6Om5v dGlmeUZhaWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6 OmRpZFJlY2VpdmVIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVDdXJs RGVsZWdhdGU6OmRpZFJlY2VpdmVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlQ3VybERlbGVnYXRlOjp3aWxsU2VuZERhdGEpOgorCiAyMDE3LTA5LTA2ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGNhY2hpbmcgb2YgUmVz cG9uc2Ugd2l0aCBhIFJlYWRhYmxlU3RyZWFtIGJvZHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAKaW5k ZXggM2UxYjNiMGRjY2EuLmRiOWQ1M2FlOTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcApAQCAt MjMwLDggKzIzMCw2IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2hhbGxlbmdlUmVq ZWN0aW9uKGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikKICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKIH0KIAotLy8gc3luYyBsb2FkZXIKLQogdm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxh dGZvcm1Mb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0 LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFN0b3JlZENyZWRlbnRpYWxzLCBSZXNv dXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFy PiYgZGF0YSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtMjM5LDYgKzIzNyw3 IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hyb25vdXNs eShOZXR3b3JraW5nQ29udGV4dCogY29udGV4CiAgICAgU3luY2hyb25vdXNMb2FkZXJDbGllbnQg Y2xpZW50OwogICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gaGFuZGxlID0gYWRvcHRSZWYobmV3 IFJlc291cmNlSGFuZGxlKGNvbnRleHQsIHJlcXVlc3QsICZjbGllbnQsIGZhbHNlLCBmYWxzZSkp OwogCisgICAgaGFuZGxlLT5kLT5tX2RlbGVnYXRlID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFu ZGxlQ3VybERlbGVnYXRlKGhhbmRsZS5nZXQoKSkpOwogICAgIGhhbmRsZS0+ZC0+bV9kZWxlZ2F0 ZS0+ZGlzcGF0Y2hTeW5jaHJvbm91c0pvYigpOwogCiAgICAgZXJyb3IgPSBjbGllbnQuZXJyb3Io KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNv dXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuY3BwCmluZGV4IDIwZWU5ZjEyNzc2 Li4xMWMxY2MxODVkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuY3BwCkBA IC0xNzEsMTggKzE3MSwxMCBAQCB2b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpkaXNw YXRjaFN5bmNocm9ub3VzSm9iKCkKICAgICBtX2N1cmxIYW5kbGUuZ2V0VGltZXMocHJldHJhbnNm ZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWUpOwogICAg IHNldFdlYlRpbWluZ3MocHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0VGlt ZSwgYXBwQ29ubmVjdFRpbWUpOwogCi0gICAgaWYgKG1faGFuZGxlLT5jbGllbnQoKSkgewotICAg ICAgICBpZiAocmV0ICE9IENVUkxFX09LKSB7Ci0gICAgICAgICAgICBTdHJpbmcgZG9tYWluID0g Q3VybENvbnRleHQ6OmVycm9yRG9tYWluOwotICAgICAgICAgICAgaW50IGVycm9yQ29kZSA9IG1f Y3VybEhhbmRsZS5lcnJvckNvZGUoKTsKLSAgICAgICAgICAgIFVSTCBmYWlsaW5nVVJMID0gbV9j dXJsSGFuZGxlLmdldEVmZmVjdGl2ZVVSTCgpOwotICAgICAgICAgICAgU3RyaW5nIGVycm9yRGVz Y3JpcHRpb24gPSBtX2N1cmxIYW5kbGUuZXJyb3JEZXNjcmlwdGlvbigpOwotICAgICAgICAgICAg dW5zaWduZWQgc3NsRXJyb3JzID0gbV9jdXJsSGFuZGxlLmdldFNzbEVycm9ycygpOwotCi0gICAg ICAgICAgICBtX2hhbmRsZS0+Y2xpZW50KCktPmRpZEZhaWwobV9oYW5kbGUsIFJlc291cmNlRXJy b3IoZG9tYWluLCBlcnJvckNvZGUsIGZhaWxpbmdVUkwsIGVycm9yRGVzY3JpcHRpb24sIHNzbEVy cm9ycykpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIG1faGFuZGxlLT5jbGllbnQoKS0+ ZGlkUmVjZWl2ZVJlc3BvbnNlKG1faGFuZGxlLCBSZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNlKCkp KTsKLSAgICB9CisgICAgaWYgKHJldCAhPSBDVVJMRV9PSykKKyAgICAgICAgbm90aWZ5RmFpbCgp OworICAgIGVsc2UKKyAgICAgICAgbm90aWZ5RmluaXNoKCk7CiB9CiAKIHZvaWQgUmVzb3VyY2VI YW5kbGVDdXJsRGVsZWdhdGU6OnJldGFpbigpCkBAIC0yOTEsMTEgKzI4MywxNSBAQCB2b2lkIFJl c291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpub3RpZnlGaW5pc2goKQogCiAgICAgbV9jdXJsSGFu ZGxlLmdldFRpbWVzKHByZXRyYW5zZmVyVGltZSwgZG5zTG9va3VwVGltZSwgY29ubmVjdFRpbWUs IGFwcENvbm5lY3RUaW1lKTsKIAotICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKSwgcHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBjb25uZWN0 VGltZSwgYXBwQ29ubmVjdFRpbWVdIHsKLSAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hh bmRsZSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmlu aXNoKHByZXRyYW5zZmVyVGltZSwgZG5zTG9va3VwVGltZSwgY29ubmVjdFRpbWUsIGFwcENvbm5l Y3RUaW1lKTsKLSAgICB9KTsKKyAgICBpZiAoaXNNYWluVGhyZWFkKCkpCisgICAgICAgIGRpZEZp bmlzaChwcmV0cmFuc2ZlclRpbWUsIGRuc0xvb2t1cFRpbWUsIGNvbm5lY3RUaW1lLCBhcHBDb25u ZWN0VGltZSk7CisgICAgZWxzZSB7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3Rl ZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJldHJhbnNmZXJUaW1lLCBkbnNMb29rdXBUaW1lLCBj b25uZWN0VGltZSwgYXBwQ29ubmVjdFRpbWVdIHsKKyAgICAgICAgICAgIGlmICghcHJvdGVjdGVk VGhpcy0+bV9oYW5kbGUpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcHJv dGVjdGVkVGhpcy0+ZGlkRmluaXNoKHByZXRyYW5zZmVyVGltZSwgZG5zTG9va3VwVGltZSwgY29u bmVjdFRpbWUsIGFwcENvbm5lY3RUaW1lKTsKKyAgICAgICAgfSk7CisgICAgfQogfQogCiB2b2lk IFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpub3RpZnlGYWlsKCkKQEAgLTMwNiwxMSArMzAy LDE1IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZhaWwoKQogICAg IFN0cmluZyBlcnJvckRlc2NyaXB0aW9uID0gbV9jdXJsSGFuZGxlLmVycm9yRGVzY3JpcHRpb24o KTsKICAgICB1bnNpZ25lZCBzc2xFcnJvcnMgPSBtX2N1cmxIYW5kbGUuZ2V0U3NsRXJyb3JzKCk7 CiAKLSAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGRvbWFpbiA9IGRvbWFpbi5pc29sYXRlZENvcHkoKSwgZXJyb3JDb2RlLCBmYWlsaW5nVVJMID0g ZmFpbGluZ1VSTC5pc29sYXRlZENvcHkoKSwgZXJyb3JEZXNjcmlwdGlvbiA9IGVycm9yRGVzY3Jp cHRpb24uaXNvbGF0ZWRDb3B5KCksIHNzbEVycm9yc10gewotICAgICAgICBpZiAoIXByb3RlY3Rl ZFRoaXMtPm1faGFuZGxlKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBwcm90ZWN0ZWRU aGlzLT5kaWRGYWlsKGRvbWFpbiwgZXJyb3JDb2RlLCBmYWlsaW5nVVJMLCBlcnJvckRlc2NyaXB0 aW9uLCBzc2xFcnJvcnMpOwotICAgIH0pOworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAg ICAgZGlkRmFpbChkb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VSTCwgZXJyb3JEZXNjcmlwdGlv biwgc3NsRXJyb3JzKTsKKyAgICBlbHNlIHsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcHJv dGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBkb21haW4gPSBkb21haW4uaXNvbGF0ZWRDb3B5 KCksIGVycm9yQ29kZSwgZmFpbGluZ1VSTCA9IGZhaWxpbmdVUkwuaXNvbGF0ZWRDb3B5KCksIGVy cm9yRGVzY3JpcHRpb24gPSBlcnJvckRlc2NyaXB0aW9uLmlzb2xhdGVkQ29weSgpLCBzc2xFcnJv cnNdIHsKKyAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbChkb21h aW4sIGVycm9yQ29kZSwgZmFpbGluZ1VSTCwgZXJyb3JEZXNjcmlwdGlvbiwgc3NsRXJyb3JzKTsK KyAgICAgICAgfSk7CisgICAgfQogfQogCiBSZXNvdXJjZVJlc3BvbnNlJiBSZXNvdXJjZUhhbmRs ZUN1cmxEZWxlZ2F0ZTo6cmVzcG9uc2UoKQpAQCAtODY4LDE3ICs4NjgsMjUgQEAgc2l6ZV90IFJl c291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpkaWRSZWNlaXZlSGVhZGVyKFN0cmluZyYmIGhlYWRl cikKICAgICAgICAgbG9uZyBsb25nIGNvbnRlbnRMZW5ndGggPSAwOwogICAgICAgICBtX2N1cmxI YW5kbGUuZ2V0Q29udGVudExlbmdodERvd25sb2FkKGNvbnRlbnRMZW5ndGgpOwogCi0gICAgICAg IGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgaHR0cENv ZGUsIGNvbnRlbnRMZW5ndGhdIHsKLSAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9o YW5kbGUpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgcHJvdGVjdGVkVGhp cy0+ZGlkUmVjZWl2ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNvbnRlbnRMZW5ndGgpOwotICAgICAg ICB9KTsKKyAgICAgICAgaWYgKGlzTWFpblRocmVhZCgpKQorICAgICAgICAgICAgZGlkUmVjZWl2 ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNvbnRlbnRMZW5ndGgpOworICAgICAgICBlbHNlIHsKKyAg ICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KSwgaHR0cENvZGUsIGNvbnRlbnRMZW5ndGhdIHsKKyAgICAgICAgICAgICAgICBpZiAoIXByb3Rl Y3RlZFRoaXMtPm1faGFuZGxlKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUFsbEhlYWRlcnMoaHR0cENvZGUsIGNv bnRlbnRMZW5ndGgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KICAgICB9IGVsc2Ugewot ICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGhlYWRlciA9IGhlYWRlci5pc29sYXRlZENvcHkoKSBdIHsKLSAgICAgICAgICAgIGlmICghcHJv dGVjdGVkVGhpcy0+bV9oYW5kbGUpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAg ICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2ZUhlYWRlckxpbmUoaGVhZGVyKTsKLSAgICAgICAg fSk7CisgICAgICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgICAgIGRpZFJlY2VpdmVI ZWFkZXJMaW5lKGhlYWRlcik7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgY2FsbE9uTWFp blRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBoZWFkZXIgPSBoZWFkZXIu aXNvbGF0ZWRDb3B5KCkgXSB7CisgICAgICAgICAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5t X2hhbmRsZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHBy b3RlY3RlZFRoaXMtPmRpZFJlY2VpdmVIZWFkZXJMaW5lKGhlYWRlcik7CisgICAgICAgICAgICB9 KTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIHJldHVybiBoZWFkZXIubGVuZ3RoKCk7CkBAIC05 MDQsMTEgKzkxMiwxNSBAQCBzaXplX3QgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZFJl Y2VpdmVEYXRhKFRocmVhZFNhZmVEYXRhQnVmZmVyIGRhdGEpCiAgICAgaWYgKCFkYXRhLnNpemUo KSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRU aGlzID0gbWFrZVJlZigqdGhpcyksIGRhdGFdIHsKLSAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlz LT5tX2hhbmRsZSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgcHJvdGVjdGVkVGhpcy0+ ZGlkUmVjZWl2ZUNvbnRlbnREYXRhKGRhdGEpOwotICAgIH0pOworICAgIGlmIChpc01haW5UaHJl YWQoKSkKKyAgICAgICAgZGlkUmVjZWl2ZUNvbnRlbnREYXRhKGRhdGEpOworICAgIGVsc2Ugewor ICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGRhdGFdIHsKKyAgICAgICAgICAgIGlmICghcHJvdGVjdGVkVGhpcy0+bV9oYW5kbGUpCisgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkUmVjZWl2 ZUNvbnRlbnREYXRhKGRhdGEpOworICAgICAgICB9KTsKKyAgICB9CiAKICAgICByZXR1cm4gZGF0 YS5zaXplKCk7CiB9CkBAIC05MzUsMTUgKzk0NywxOSBAQCBzaXplX3QgUmVzb3VyY2VIYW5kbGVD dXJsRGVsZWdhdGU6OndpbGxTZW5kRGF0YShjaGFyKiBidWZmZXIsIHNpemVfdCBibG9ja1NpemUs CiAKICAgICAgICAgbV9zZW5kQnl0ZXMgPSAwOwogCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQo W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgYnVmZmVyLCBibG9ja1NpemUsIG51bWJl ck9mQmxvY2tzXSB7Ci0gICAgICAgICAgICBpZiAoIXByb3RlY3RlZFRoaXMtPm1faGFuZGxlKQot ICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPnByZXBh cmVTZW5kRGF0YShidWZmZXIsIGJsb2NrU2l6ZSwgbnVtYmVyT2ZCbG9ja3MpOwotICAgICAgICB9 KTsKLQotICAgICAgICBtX3dvcmtlclRocmVhZENvbmRpdGlvblZhcmlhYmxlLndhaXQobG9jaywg W3RoaXNdIHsKLSAgICAgICAgICAgIHJldHVybiBtX3NlbmRCeXRlczsKLSAgICAgICAgfSk7Cisg ICAgICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgICAgIHByZXBhcmVTZW5kRGF0YShi dWZmZXIsIGJsb2NrU2l6ZSwgbnVtYmVyT2ZCbG9ja3MpOworICAgICAgICBlbHNlIHsKKyAgICAg ICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwg YnVmZmVyLCBibG9ja1NpemUsIG51bWJlck9mQmxvY2tzXSB7CisgICAgICAgICAgICAgICAgaWYg KCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPnByZXBhcmVTZW5kRGF0YShidWZmZXIsIGJs b2NrU2l6ZSwgbnVtYmVyT2ZCbG9ja3MpOworICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAg IG1fd29ya2VyVGhyZWFkQ29uZGl0aW9uVmFyaWFibGUud2FpdChsb2NrLCBbdGhpc10geworICAg ICAgICAgICAgICAgIHJldHVybiBtX3NlbmRCeXRlczsKKyAgICAgICAgICAgIH0pOworICAgICAg ICB9CiAgICAgfQogCiAgICAgcmV0dXJuIG1fc2VuZEJ5dGVzOwo=