174205 2017-07-06 09:52:51 -0700 Crash under WebResourceLoadStatisticsStore::persistentStoragePath(WTF::String const&) 2017-07-06 12:22:40 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson bfulgham commit-queue koivisto webkit-bug-importer wilander oldest_to_newest 1326067 0 cdumez 2017-07-06 09:52:51 -0700 Crash under WebResourceLoadStatisticsStore::persistentStoragePath(WTF::String const&): 27 WebKit: WebKit::WebResourceLoadStatisticsStore::persistentStoragePath(WTF::String const&) const <== 27 WebKit: WebKit::WebResourceLoadStatisticsStore::createDecoderFromDisk(WTF::String const&) const 27 WebKit: WebKit::WebResourceLoadStatisticsStore::createDecoderFromDisk(WTF::String const&) const 27 WebKit: WebKit::WebResourceLoadStatisticsStore::refreshFromDisk() 27 libdispatch.dylib: _dispatch_client_callout 24 libdispatch.dylib: _dispatch_continuation_pop$VARIANT$mp | 24 libdispatch.dylib: _dispatch_source_invoke$VARIANT$mp | 24 libdispatch.dylib: _dispatch_queue_serial_drain$VARIANT$mp | 24 libdispatch.dylib: _dispatch_queue_invoke$VARIANT$mp | 24 libdispatch.dylib: _dispatch_root_queue_drain_deferred_wlh$VARIANT$mp | 24 libdispatch.dylib: _dispatch_workloop_worker_thread$VARIANT$mp | 24 libsystem_pthread.dylib: _pthread_wqthread | 24 libsystem_pthread.dylib: pruning: 3 libdispatch.dylib: _dispatch_continuation_pop$VARIANT$armv81 1326068 1 cdumez 2017-07-06 09:53:08 -0700 <rdar://problem/33093552> 1326069 2 314727 cdumez 2017-07-06 09:54:18 -0700 Created attachment 314727 Patch 1326072 3 314729 cdumez 2017-07-06 10:00:11 -0700 Created attachment 314729 Patch 1326073 4 314729 bfulgham 2017-07-06 10:01:02 -0700 Comment on attachment 314729 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314729&action=review > Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp:289 > + String resourceLog = resourceLogFilePath(); This is a good chance. We originally thought we might want multiple files, so the label made sense, but it's just been added complexity. Good riddance! 1326074 5 cdumez 2017-07-06 10:02:07 -0700 (In reply to Brent Fulgham from comment #4) > Comment on attachment 314729 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=314729&action=review > > > Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp:289 > > + String resourceLog = resourceLogFilePath(); > > This is a good chance. We originally thought we might want multiple files, > so the label made sense, but it's just been added complexity. Good riddance! Yes, we can introduce the label back when we actually need it. 1326076 6 314730 cdumez 2017-07-06 10:07:01 -0700 Created attachment 314730 Patch 1326090 7 314730 bfulgham 2017-07-06 10:21:13 -0700 Comment on attachment 314730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314730&action=review r=me > Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp:364 > + return m_statisticsStoragePath.isolatedCopy(); I have to admit I'm shocked that this was necessary -- I guess it's because we might call this method on the work queue? 1326097 8 314730 cdumez 2017-07-06 10:29:08 -0700 Comment on attachment 314730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314730&action=review >> Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp:364 >> + return m_statisticsStoragePath.isolatedCopy(); > > I have to admit I'm shocked that this was necessary -- I guess it's because we might call this method on the work queue? This is definitely called from the background work queue. 1326114 9 314738 cdumez 2017-07-06 11:31:31 -0700 Created attachment 314738 Patch 1326127 10 314738 commit-queue 2017-07-06 12:22:39 -0700 Comment on attachment 314738 Patch Clearing flags on attachment: 314738 Committed r219211: <http://trac.webkit.org/changeset/219211> 1326128 11 commit-queue 2017-07-06 12:22:40 -0700 All reviewed patches have been landed. Closing bug. 314727 2017-07-06 09:54:18 -0700 2017-07-06 10:00:10 -0700 Patch bug-174205-20170706095418.patch text/plain 6790 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IzYWVlNDg0NDE5OTEw NWJiMTJlMzBiZDhiM2ZmMGNiNmY4MDA2OS4uYjMwODMyMGM4N2NiOGJlYjkwZTkyYTE5NjcwNTY4 YTI1ZWFlMTE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwZXJzaXN0ZW50U3RvcmFnZVBhdGgoV1RGOjpTdHJp bmcgY29uc3QmKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc0MjA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzA5MzU1Mj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgd2UgaXNvbGF0 ZUNvcHkoKSBtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aCBiZWZvcmUgdXNpbmcgaXQgZnJvbSB0aGUg YmFja2dyb3VuZAorICAgICAgICB0aHJlYWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWFkRGF0YUZyb21EaXNrSWZOZWVkZWQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlZnJlc2hGcm9tRGlz ayk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVz b3VyY2VMb2dGaWxlUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6c3RhdGlzdGljc0ZpbGVQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZVN0b3JlVG9EaXNrKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZUVuY29kZXJUb0Rpc2sp OgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlbGV0 ZVN0b3JlRnJvbURpc2spOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnN0YXJ0TW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzeW5jV2l0aEV4aXN0aW5nU3Rh dGlzdGljc1N0b3JhZ2VJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6cGVyc2lzdGVudFN0b3JhZ2VQYXRoKTogRGVsZXRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6CisKIDIwMTct MDctMDYgIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1RLXSBJdCBzaG91bGQgcHJvY2VzcyBNb3VzZU1vdmVkIGV2ZW50cyB3aGVuIHRoZSBwYXJl bnQgd2luZG93IGlzIG5vdCBhY3RpdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZDEzZWEw NTdmYmI0YWVkYTJiMmZhZWI0Y2M1MDkzMDc5MjVmNTU2NS4uNmQxMjc0MDU0ODUxNGNhMWM4ZWMw OTZjMWJkNDM0ODFhZDNkYjJmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTI4Niw3ICsy ODYsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVhZERhdGFGcm9t RGlza0lmTmVlZGVkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9zdGF0aXN0aWNzUXVldWUt PmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKLSAgICAg ICAgU3RyaW5nIHJlc291cmNlTG9nID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRoKEFTQ0lJTGl0ZXJh bCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgICAgICBTdHJpbmcgcmVzb3VyY2VMb2cg PSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgICAgIGlmIChyZXNvdXJjZUxvZy5pc0VtcHR5 KCkgfHwgIWZpbGVFeGlzdHMocmVzb3VyY2VMb2cpKSB7CiAgICAgICAgICAgICBncmFuZGZhdGhl ckV4aXN0aW5nV2Vic2l0ZURhdGEoKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTMxOSw3ICsz MTksNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVmcmVzaEZyb21E aXNrKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIFN0cmluZyBy ZXNvdXJjZUxvZyA9IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJv d3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0Zp bGVQYXRoKCk7CiAgICAgaWYgKHJlc291cmNlTG9nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu OwogCkBAIC0zNTksMTMgKzM1OSwxOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6YXBwbGljYXRpb25XaWxsVGVybWluYXRlKCkKICAgICBzZW1hcGhvcmUud2FpdChXYWxs VGltZTo6aW5maW5pdHkoKSk7CiB9CiAKLVN0cmluZyBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnBlcnNpc3RlbnRTdG9yYWdlUGF0aChjb25zdCBTdHJpbmcmIGxhYmVsKSBjb25zdAor U3RyaW5nIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVzb3VyY2VMb2dGaWxlUGF0 aCgpIGNvbnN0CiB7Ci0gICAgaWYgKG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLmlzRW1wdHkoKSkK KyAgICByZXR1cm4gbV9zdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNvbGF0ZWRDb3B5KCk7Cit9CisK K1N0cmluZyBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN0YXRpc3RpY3NGaWxlUGF0 aCgpIGNvbnN0Cit7CisgICAgU3RyaW5nIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCA9IHRoaXMtPnN0 YXRpc3RpY3NTdG9yYWdlUGF0aCgpOworICAgIGlmIChzdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAogICAgIC8vIFRPRE8gRGVj aWRlIHdoYXQgdG8gY2FsbCB0aGlzIGZpbGUKLSAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5nQ29t cG9uZW50KG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLCBsYWJlbCArICJfcmVzb3VyY2VMb2cucGxp c3QiKTsKKyAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHN0YXRpc3RpY3NTdG9y YWdlUGF0aCwgImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbl9yZXNvdXJjZUxvZy5wbGlzdCIpOwogfQog CiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6d3JpdGVTdG9yZVRvRGlzaygp CkBAIC0zNzYsNyArMzgyLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OndyaXRlU3RvcmVUb0Rpc2soKQogCiAgICAgYXV0byBlbmNvZGVyID0gY29yZVN0b3JlKCkuY3Jl YXRlRW5jb2RlckZyb21EYXRhKCk7CiAKLSAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSBwZXJzaXN0 ZW50U3RvcmFnZVBhdGgoQVNDSUlMaXRlcmFsKCJmdWxsX2Jyb3dzaW5nX3Nlc3Npb24iKSk7Cisg ICAgU3RyaW5nIHJlc291cmNlTG9nID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIHdyaXRl RW5jb2RlclRvRGlzaygqZW5jb2Rlci5nZXQoKSwgcmVzb3VyY2VMb2cpOwogCiAgICAgbV9sYXN0 U3RhdGlzdGljc0ZpbGVTeW5jVGltZSA9IFdhbGxUaW1lOjpub3coKTsKQEAgLTQxNSw4ICs0MjEs OSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6d3JpdGVFbmNvZGVyVG9E aXNrKEtleWVkRW5jb2RlciYgZW5jb2RlciwgYwogICAgIGlmICghcmF3RGF0YSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgaWYgKCFtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc0VtcHR5KCkpIHsK LSAgICAgICAgbWFrZUFsbERpcmVjdG9yaWVzKG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoKTsKKyAg ICBhdXRvIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCA9IHRoaXMtPnN0YXRpc3RpY3NTdG9yYWdlUGF0 aCgpCisgICAgaWYgKCFzdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNFbXB0eSgpKSB7CisgICAgICAg IG1ha2VBbGxEaXJlY3RvcmllcyhzdGF0aXN0aWNzU3RvcmFnZVBhdGgpOwogICAgICAgICBwbGF0 Zm9ybUV4Y2x1ZGVGcm9tQmFja3VwKCk7CiAgICAgfQogCkBAIC00MzQsNyArNDQxLDcgQEAgdm9p ZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OndyaXRlRW5jb2RlclRvRGlzayhLZXll ZEVuY29kZXImIGVuY29kZXIsIGMKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpkZWxldGVTdG9yZUZyb21EaXNrKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigp KTsKLSAgICBTdHJpbmcgcmVzb3VyY2VMb2dQYXRoID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRoKEFT Q0lJTGl0ZXJhbCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgIFN0cmluZyByZXNvdXJj ZUxvZ1BhdGggPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgaWYgKHJlc291cmNlTG9nUGF0 aC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtNDU2LDcgKzQ2Myw3IEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdGFydE1vbml0b3JpbmdTdGF0aXN0aWNz U3RvcmFnZSgpCiAgICAgaWYgKG1fc3RhdGlzdGljc1N0b3JhZ2VNb25pdG9yKQogICAgICAgICBy ZXR1cm47CiAgICAgCi0gICAgU3RyaW5nIHJlc291cmNlTG9nUGF0aCA9IHBlcnNpc3RlbnRTdG9y YWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBTdHJp bmcgcmVzb3VyY2VMb2dQYXRoID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIGlmIChyZXNv dXJjZUxvZ1BhdGguaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAgICAgCkBAIC00OTQsNyAr NTAxLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN5bmNXaXRoRXhp c3RpbmdTdGF0aXN0aWNzU3RvcmFnZUlmTmVlZGVkKCkKICAgICBpZiAobV9zdGF0aXN0aWNzU3Rv cmFnZU1vbml0b3IpCiAgICAgICAgIHJldHVybjsKIAotICAgIFN0cmluZyByZXNvdXJjZUxvZyA9 IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lv biIpKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAg ICAgaWYgKHJlc291cmNlTG9nLmlzRW1wdHkoKSB8fCAhZmlsZUV4aXN0cyhyZXNvdXJjZUxvZykp CiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IDk5MTM5YTAyOTNlNjZl ZmMyYTU0ODk2M2M4OTJiMDgxZDgzMTFmOTIuLjFiNTYxZDQ1YjBmNjc4MzM5OGQ0ZmMwOTViMWEy NmY4NWIxOWM5NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTExNCw3ICsxMTQsOCBAQCBwcml2 YXRlOgogICAgIHZvaWQgc3RhcnRNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKTsKICAgICB2 b2lkIHN0b3BNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKTsKIAotICAgIFN0cmluZyBwZXJz aXN0ZW50U3RvcmFnZVBhdGgoY29uc3QgU3RyaW5nJiBsYWJlbCkgY29uc3Q7CisgICAgU3RyaW5n IHN0YXRpc3RpY3NTdG9yYWdlUGF0aCgpIGNvbnN0OworICAgIFN0cmluZyByZXNvdXJjZUxvZ0Zp bGVQYXRoKCkgY29uc3Q7CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZvaWQg ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJp ZGU7CkBAIC0xNDYsNyArMTQ3LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIFJlZjxXVEY6Oldv cmtRdWV1ZT4gbV9zdGF0aXN0aWNzUXVldWU7CiAgICAgUmVmUHRyPFdlYkNvcmU6OkZpbGVNb25p dG9yPiBtX3N0YXRpc3RpY3NTdG9yYWdlTW9uaXRvcjsKLSAgICBTdHJpbmcgbV9zdGF0aXN0aWNz U3RvcmFnZVBhdGg7CisgICAgY29uc3QgU3RyaW5nIG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoOwog ICAgIFdURjo6V2FsbFRpbWUgbV9sYXN0U3RhdGlzdGljc0ZpbGVTeW5jVGltZTsKICAgICBib29s IG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQgeyBmYWxzZSB9OwogICAgIFJ1bkxvb3A6 OlRpbWVyPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZT4gbV90ZWxlbWV0cnlPbmVTaG90 VGltZXI7Cg== 314729 2017-07-06 10:00:11 -0700 2017-07-06 10:07:00 -0700 Patch bug-174205-20170706100010.patch text/plain 6793 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IzYWVlNDg0NDE5OTEw NWJiMTJlMzBiZDhiM2ZmMGNiNmY4MDA2OS4uYjMwODMyMGM4N2NiOGJlYjkwZTkyYTE5NjcwNTY4 YTI1ZWFlMTE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwZXJzaXN0ZW50U3RvcmFnZVBhdGgoV1RGOjpTdHJp bmcgY29uc3QmKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc0MjA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzA5MzU1Mj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgd2UgaXNvbGF0 ZUNvcHkoKSBtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aCBiZWZvcmUgdXNpbmcgaXQgZnJvbSB0aGUg YmFja2dyb3VuZAorICAgICAgICB0aHJlYWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWFkRGF0YUZyb21EaXNrSWZOZWVkZWQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlZnJlc2hGcm9tRGlz ayk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVz b3VyY2VMb2dGaWxlUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6c3RhdGlzdGljc0ZpbGVQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZVN0b3JlVG9EaXNrKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZUVuY29kZXJUb0Rpc2sp OgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlbGV0 ZVN0b3JlRnJvbURpc2spOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnN0YXJ0TW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzeW5jV2l0aEV4aXN0aW5nU3Rh dGlzdGljc1N0b3JhZ2VJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6cGVyc2lzdGVudFN0b3JhZ2VQYXRoKTogRGVsZXRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6CisKIDIwMTct MDctMDYgIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1RLXSBJdCBzaG91bGQgcHJvY2VzcyBNb3VzZU1vdmVkIGV2ZW50cyB3aGVuIHRoZSBwYXJl bnQgd2luZG93IGlzIG5vdCBhY3RpdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZDEzZWEw NTdmYmI0YWVkYTJiMmZhZWI0Y2M1MDkzMDc5MjVmNTU2NS4uM2RlMTlhZGIxMDE1NGFhY2Q2ZWVm NDUxZjY1MTdiYWExMWMyZDBlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTI4Niw3ICsy ODYsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVhZERhdGFGcm9t RGlza0lmTmVlZGVkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9zdGF0aXN0aWNzUXVldWUt PmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKLSAgICAg ICAgU3RyaW5nIHJlc291cmNlTG9nID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRoKEFTQ0lJTGl0ZXJh bCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgICAgICBTdHJpbmcgcmVzb3VyY2VMb2cg PSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgICAgIGlmIChyZXNvdXJjZUxvZy5pc0VtcHR5 KCkgfHwgIWZpbGVFeGlzdHMocmVzb3VyY2VMb2cpKSB7CiAgICAgICAgICAgICBncmFuZGZhdGhl ckV4aXN0aW5nV2Vic2l0ZURhdGEoKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTMxOSw3ICsz MTksNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVmcmVzaEZyb21E aXNrKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIFN0cmluZyBy ZXNvdXJjZUxvZyA9IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJv d3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0Zp bGVQYXRoKCk7CiAgICAgaWYgKHJlc291cmNlTG9nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu OwogCkBAIC0zNTksMTMgKzM1OSwxOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6YXBwbGljYXRpb25XaWxsVGVybWluYXRlKCkKICAgICBzZW1hcGhvcmUud2FpdChXYWxs VGltZTo6aW5maW5pdHkoKSk7CiB9CiAKLVN0cmluZyBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnBlcnNpc3RlbnRTdG9yYWdlUGF0aChjb25zdCBTdHJpbmcmIGxhYmVsKSBjb25zdAor U3RyaW5nIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3RhdGlzdGljc1N0b3JhZ2VQ YXRoKCkgY29uc3QKIHsKLSAgICBpZiAobV9zdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNFbXB0eSgp KQorICAgIHJldHVybiBtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc29sYXRlZENvcHkoKTsKK30K KworU3RyaW5nIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVzb3VyY2VMb2dGaWxl UGF0aCgpIGNvbnN0Cit7CisgICAgU3RyaW5nIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCA9IHRoaXMt PnN0YXRpc3RpY3NTdG9yYWdlUGF0aCgpOworICAgIGlmIChzdGF0aXN0aWNzU3RvcmFnZVBhdGgu aXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAogICAgIC8vIFRPRE8g RGVjaWRlIHdoYXQgdG8gY2FsbCB0aGlzIGZpbGUKLSAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5n Q29tcG9uZW50KG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLCBsYWJlbCArICJfcmVzb3VyY2VMb2cu cGxpc3QiKTsKKyAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHN0YXRpc3RpY3NT dG9yYWdlUGF0aCwgImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbl9yZXNvdXJjZUxvZy5wbGlzdCIpOwog fQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6d3JpdGVTdG9yZVRvRGlz aygpCkBAIC0zNzYsNyArMzgyLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OndyaXRlU3RvcmVUb0Rpc2soKQogCiAgICAgYXV0byBlbmNvZGVyID0gY29yZVN0b3JlKCku Y3JlYXRlRW5jb2RlckZyb21EYXRhKCk7CiAKLSAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSBwZXJz aXN0ZW50U3RvcmFnZVBhdGgoQVNDSUlMaXRlcmFsKCJmdWxsX2Jyb3dzaW5nX3Nlc3Npb24iKSk7 CisgICAgU3RyaW5nIHJlc291cmNlTG9nID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIHdy aXRlRW5jb2RlclRvRGlzaygqZW5jb2Rlci5nZXQoKSwgcmVzb3VyY2VMb2cpOwogCiAgICAgbV9s YXN0U3RhdGlzdGljc0ZpbGVTeW5jVGltZSA9IFdhbGxUaW1lOjpub3coKTsKQEAgLTQxNSw4ICs0 MjEsOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6d3JpdGVFbmNvZGVy VG9EaXNrKEtleWVkRW5jb2RlciYgZW5jb2RlciwgYwogICAgIGlmICghcmF3RGF0YSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKCFtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc0VtcHR5KCkp IHsKLSAgICAgICAgbWFrZUFsbERpcmVjdG9yaWVzKG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoKTsK KyAgICBhdXRvIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCA9IHRoaXMtPnN0YXRpc3RpY3NTdG9yYWdl UGF0aCgpCisgICAgaWYgKCFzdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNFbXB0eSgpKSB7CisgICAg ICAgIG1ha2VBbGxEaXJlY3RvcmllcyhzdGF0aXN0aWNzU3RvcmFnZVBhdGgpOwogICAgICAgICBw bGF0Zm9ybUV4Y2x1ZGVGcm9tQmFja3VwKCk7CiAgICAgfQogCkBAIC00MzQsNyArNDQxLDcgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OndyaXRlRW5jb2RlclRvRGlzayhL ZXllZEVuY29kZXImIGVuY29kZXIsIGMKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpkZWxldGVTdG9yZUZyb21EaXNrKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFp bigpKTsKLSAgICBTdHJpbmcgcmVzb3VyY2VMb2dQYXRoID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRo KEFTQ0lJTGl0ZXJhbCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgIFN0cmluZyByZXNv dXJjZUxvZ1BhdGggPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgaWYgKHJlc291cmNlTG9n UGF0aC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtNDU2LDcgKzQ2Myw3IEBAIHZv aWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdGFydE1vbml0b3JpbmdTdGF0aXN0 aWNzU3RvcmFnZSgpCiAgICAgaWYgKG1fc3RhdGlzdGljc1N0b3JhZ2VNb25pdG9yKQogICAgICAg ICByZXR1cm47CiAgICAgCi0gICAgU3RyaW5nIHJlc291cmNlTG9nUGF0aCA9IHBlcnNpc3RlbnRT dG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBT dHJpbmcgcmVzb3VyY2VMb2dQYXRoID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIGlmIChy ZXNvdXJjZUxvZ1BhdGguaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAgICAgCkBAIC00OTQs NyArNTAxLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN5bmNXaXRo RXhpc3RpbmdTdGF0aXN0aWNzU3RvcmFnZUlmTmVlZGVkKCkKICAgICBpZiAobV9zdGF0aXN0aWNz U3RvcmFnZU1vbml0b3IpCiAgICAgICAgIHJldHVybjsKIAotICAgIFN0cmluZyByZXNvdXJjZUxv ZyA9IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vz c2lvbiIpKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7 CiAgICAgaWYgKHJlc291cmNlTG9nLmlzRW1wdHkoKSB8fCAhZmlsZUV4aXN0cyhyZXNvdXJjZUxv ZykpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IDk5MTM5YTAyOTNl NjZlZmMyYTU0ODk2M2M4OTJiMDgxZDgzMTFmOTIuLjFiNTYxZDQ1YjBmNjc4MzM5OGQ0ZmMwOTVi MWEyNmY4NWIxOWM5NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTExNCw3ICsxMTQsOCBAQCBw cml2YXRlOgogICAgIHZvaWQgc3RhcnRNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKTsKICAg ICB2b2lkIHN0b3BNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKTsKIAotICAgIFN0cmluZyBw ZXJzaXN0ZW50U3RvcmFnZVBhdGgoY29uc3QgU3RyaW5nJiBsYWJlbCkgY29uc3Q7CisgICAgU3Ry aW5nIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCgpIGNvbnN0OworICAgIFN0cmluZyByZXNvdXJjZUxv Z0ZpbGVQYXRoKCkgY29uc3Q7CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZv aWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3Zl cnJpZGU7CkBAIC0xNDYsNyArMTQ3LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIFJlZjxXVEY6 OldvcmtRdWV1ZT4gbV9zdGF0aXN0aWNzUXVldWU7CiAgICAgUmVmUHRyPFdlYkNvcmU6OkZpbGVN b25pdG9yPiBtX3N0YXRpc3RpY3NTdG9yYWdlTW9uaXRvcjsKLSAgICBTdHJpbmcgbV9zdGF0aXN0 aWNzU3RvcmFnZVBhdGg7CisgICAgY29uc3QgU3RyaW5nIG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRo OwogICAgIFdURjo6V2FsbFRpbWUgbV9sYXN0U3RhdGlzdGljc0ZpbGVTeW5jVGltZTsKICAgICBi b29sIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQgeyBmYWxzZSB9OwogICAgIFJ1bkxv b3A6OlRpbWVyPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZT4gbV90ZWxlbWV0cnlPbmVT aG90VGltZXI7Cg== 314730 2017-07-06 10:07:01 -0700 2017-07-06 11:31:30 -0700 Patch bug-174205-20170706100701.patch text/plain 6794 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IzYWVlNDg0NDE5OTEw NWJiMTJlMzBiZDhiM2ZmMGNiNmY4MDA2OS4uYjMwODMyMGM4N2NiOGJlYjkwZTkyYTE5NjcwNTY4 YTI1ZWFlMTE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwZXJzaXN0ZW50U3RvcmFnZVBhdGgoV1RGOjpTdHJp bmcgY29uc3QmKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc0MjA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzA5MzU1Mj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgd2UgaXNvbGF0 ZUNvcHkoKSBtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aCBiZWZvcmUgdXNpbmcgaXQgZnJvbSB0aGUg YmFja2dyb3VuZAorICAgICAgICB0aHJlYWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWFkRGF0YUZyb21EaXNrSWZOZWVkZWQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlZnJlc2hGcm9tRGlz ayk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVz b3VyY2VMb2dGaWxlUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6c3RhdGlzdGljc0ZpbGVQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZVN0b3JlVG9EaXNrKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZUVuY29kZXJUb0Rpc2sp OgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlbGV0 ZVN0b3JlRnJvbURpc2spOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnN0YXJ0TW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzeW5jV2l0aEV4aXN0aW5nU3Rh dGlzdGljc1N0b3JhZ2VJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6cGVyc2lzdGVudFN0b3JhZ2VQYXRoKTogRGVsZXRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6CisKIDIwMTct MDctMDYgIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1RLXSBJdCBzaG91bGQgcHJvY2VzcyBNb3VzZU1vdmVkIGV2ZW50cyB3aGVuIHRoZSBwYXJl bnQgd2luZG93IGlzIG5vdCBhY3RpdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZDEzZWEw NTdmYmI0YWVkYTJiMmZhZWI0Y2M1MDkzMDc5MjVmNTU2NS4uMmU2NzJiMmFmZmZkZTVmNGU2Y2Qw NjhlNGQ4MTljZmQ2ZDJhNGNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTI4Niw3ICsy ODYsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVhZERhdGFGcm9t RGlza0lmTmVlZGVkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9zdGF0aXN0aWNzUXVldWUt PmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKLSAgICAg ICAgU3RyaW5nIHJlc291cmNlTG9nID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRoKEFTQ0lJTGl0ZXJh bCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgICAgICBTdHJpbmcgcmVzb3VyY2VMb2cg PSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgICAgIGlmIChyZXNvdXJjZUxvZy5pc0VtcHR5 KCkgfHwgIWZpbGVFeGlzdHMocmVzb3VyY2VMb2cpKSB7CiAgICAgICAgICAgICBncmFuZGZhdGhl ckV4aXN0aW5nV2Vic2l0ZURhdGEoKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTMxOSw3ICsz MTksNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVmcmVzaEZyb21E aXNrKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIFN0cmluZyBy ZXNvdXJjZUxvZyA9IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJv d3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0Zp bGVQYXRoKCk7CiAgICAgaWYgKHJlc291cmNlTG9nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu OwogCkBAIC0zNTksMTMgKzM1OSwxOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6YXBwbGljYXRpb25XaWxsVGVybWluYXRlKCkKICAgICBzZW1hcGhvcmUud2FpdChXYWxs VGltZTo6aW5maW5pdHkoKSk7CiB9CiAKLVN0cmluZyBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnBlcnNpc3RlbnRTdG9yYWdlUGF0aChjb25zdCBTdHJpbmcmIGxhYmVsKSBjb25zdAor U3RyaW5nIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3RhdGlzdGljc1N0b3JhZ2VQ YXRoKCkgY29uc3QKIHsKLSAgICBpZiAobV9zdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNFbXB0eSgp KQorICAgIHJldHVybiBtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc29sYXRlZENvcHkoKTsKK30K KworU3RyaW5nIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVzb3VyY2VMb2dGaWxl UGF0aCgpIGNvbnN0Cit7CisgICAgU3RyaW5nIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCA9IHRoaXMt PnN0YXRpc3RpY3NTdG9yYWdlUGF0aCgpOworICAgIGlmIChzdGF0aXN0aWNzU3RvcmFnZVBhdGgu aXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAogICAgIC8vIFRPRE8g RGVjaWRlIHdoYXQgdG8gY2FsbCB0aGlzIGZpbGUKLSAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5n Q29tcG9uZW50KG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLCBsYWJlbCArICJfcmVzb3VyY2VMb2cu cGxpc3QiKTsKKyAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHN0YXRpc3RpY3NT dG9yYWdlUGF0aCwgImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbl9yZXNvdXJjZUxvZy5wbGlzdCIpOwog fQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6d3JpdGVTdG9yZVRvRGlz aygpCkBAIC0zNzYsNyArMzgyLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OndyaXRlU3RvcmVUb0Rpc2soKQogCiAgICAgYXV0byBlbmNvZGVyID0gY29yZVN0b3JlKCku Y3JlYXRlRW5jb2RlckZyb21EYXRhKCk7CiAKLSAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSBwZXJz aXN0ZW50U3RvcmFnZVBhdGgoQVNDSUlMaXRlcmFsKCJmdWxsX2Jyb3dzaW5nX3Nlc3Npb24iKSk7 CisgICAgU3RyaW5nIHJlc291cmNlTG9nID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIHdy aXRlRW5jb2RlclRvRGlzaygqZW5jb2Rlci5nZXQoKSwgcmVzb3VyY2VMb2cpOwogCiAgICAgbV9s YXN0U3RhdGlzdGljc0ZpbGVTeW5jVGltZSA9IFdhbGxUaW1lOjpub3coKTsKQEAgLTQxNSw4ICs0 MjEsOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6d3JpdGVFbmNvZGVy VG9EaXNrKEtleWVkRW5jb2RlciYgZW5jb2RlciwgYwogICAgIGlmICghcmF3RGF0YSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKCFtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc0VtcHR5KCkp IHsKLSAgICAgICAgbWFrZUFsbERpcmVjdG9yaWVzKG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoKTsK KyAgICBhdXRvIHN0YXRpc3RpY3NTdG9yYWdlUGF0aCA9IHRoaXMtPnN0YXRpc3RpY3NTdG9yYWdl UGF0aCgpOworICAgIGlmICghc3RhdGlzdGljc1N0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgeworICAg ICAgICBtYWtlQWxsRGlyZWN0b3JpZXMoc3RhdGlzdGljc1N0b3JhZ2VQYXRoKTsKICAgICAgICAg cGxhdGZvcm1FeGNsdWRlRnJvbUJhY2t1cCgpOwogICAgIH0KIApAQCAtNDM0LDcgKzQ0MSw3IEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZUVuY29kZXJUb0Rpc2so S2V5ZWRFbmNvZGVyJiBlbmNvZGVyLCBjCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6ZGVsZXRlU3RvcmVGcm9tRGlzaygpCiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01h aW4oKSk7Ci0gICAgU3RyaW5nIHJlc291cmNlTG9nUGF0aCA9IHBlcnNpc3RlbnRTdG9yYWdlUGF0 aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBTdHJpbmcgcmVz b3VyY2VMb2dQYXRoID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIGlmIChyZXNvdXJjZUxv Z1BhdGguaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTQ1Niw3ICs0NjMsNyBAQCB2 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3RhcnRNb25pdG9yaW5nU3RhdGlz dGljc1N0b3JhZ2UoKQogICAgIGlmIChtX3N0YXRpc3RpY3NTdG9yYWdlTW9uaXRvcikKICAgICAg ICAgcmV0dXJuOwogICAgIAotICAgIFN0cmluZyByZXNvdXJjZUxvZ1BhdGggPSBwZXJzaXN0ZW50 U3RvcmFnZVBhdGgoQVNDSUlMaXRlcmFsKCJmdWxsX2Jyb3dzaW5nX3Nlc3Npb24iKSk7CisgICAg U3RyaW5nIHJlc291cmNlTG9nUGF0aCA9IHJlc291cmNlTG9nRmlsZVBhdGgoKTsKICAgICBpZiAo cmVzb3VyY2VMb2dQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogICAgIApAQCAtNDk0 LDcgKzUwMSw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzeW5jV2l0 aEV4aXN0aW5nU3RhdGlzdGljc1N0b3JhZ2VJZk5lZWRlZCgpCiAgICAgaWYgKG1fc3RhdGlzdGlj c1N0b3JhZ2VNb25pdG9yKQogICAgICAgICByZXR1cm47CiAKLSAgICBTdHJpbmcgcmVzb3VyY2VM b2cgPSBwZXJzaXN0ZW50U3RvcmFnZVBhdGgoQVNDSUlMaXRlcmFsKCJmdWxsX2Jyb3dzaW5nX3Nl c3Npb24iKSk7CisgICAgU3RyaW5nIHJlc291cmNlTG9nID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgp OwogICAgIGlmIChyZXNvdXJjZUxvZy5pc0VtcHR5KCkgfHwgIWZpbGVFeGlzdHMocmVzb3VyY2VM b2cpKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCA5OTEzOWEwMjkz ZTY2ZWZjMmE1NDg5NjNjODkyYjA4MWQ4MzExZjkyLi4xYjU2MWQ0NWIwZjY3ODMzOThkNGZjMDk1 YjFhMjZmODViMTljOTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC0xMTQsNyArMTE0LDggQEAg cHJpdmF0ZToKICAgICB2b2lkIHN0YXJ0TW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKCk7CiAg ICAgdm9pZCBzdG9wTW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKCk7CiAKLSAgICBTdHJpbmcg cGVyc2lzdGVudFN0b3JhZ2VQYXRoKGNvbnN0IFN0cmluZyYgbGFiZWwpIGNvbnN0OworICAgIFN0 cmluZyBzdGF0aXN0aWNzU3RvcmFnZVBhdGgoKSBjb25zdDsKKyAgICBTdHJpbmcgcmVzb3VyY2VM b2dGaWxlUGF0aCgpIGNvbnN0OwogCiAgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKICAgICB2 b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92 ZXJyaWRlOwpAQCAtMTQ2LDcgKzE0Nyw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICBSZWY8V1RG OjpXb3JrUXVldWU+IG1fc3RhdGlzdGljc1F1ZXVlOwogICAgIFJlZlB0cjxXZWJDb3JlOjpGaWxl TW9uaXRvcj4gbV9zdGF0aXN0aWNzU3RvcmFnZU1vbml0b3I7Ci0gICAgU3RyaW5nIG1fc3RhdGlz dGljc1N0b3JhZ2VQYXRoOworICAgIGNvbnN0IFN0cmluZyBtX3N0YXRpc3RpY3NTdG9yYWdlUGF0 aDsKICAgICBXVEY6OldhbGxUaW1lIG1fbGFzdFN0YXRpc3RpY3NGaWxlU3luY1RpbWU7CiAgICAg Ym9vbCBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkIHsgZmFsc2UgfTsKICAgICBSdW5M b29wOjpUaW1lcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IG1fdGVsZW1ldHJ5T25l U2hvdFRpbWVyOwo= 314738 2017-07-06 11:31:31 -0700 2017-07-06 12:22:39 -0700 Patch bug-174205-20170706113131.patch text/plain 6815 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDNmNzc1NmU4MjFiNjE0 M2M1YjAzNjNjMTAzMTBiMzE0NDJiMTYyZS4uYjdhZjFiZmY0MDBmZGQyMjRlNGE2Mzg1OTM2YThk Y2Y1NWMzZDliMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgQ3Jhc2ggdW5kZXIgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwZXJzaXN0ZW50U3RvcmFnZVBhdGgoV1RGOjpTdHJp bmcgY29uc3QmKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc0MjA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzA5MzU1Mj4KKworICAgICAgICBS ZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIE1ha2Ugc3VyZSB3ZSBpc29sYXRl Q29weSgpIG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoIGJlZm9yZSB1c2luZyBpdCBmcm9tIHRoZSBi YWNrZ3JvdW5kCisgICAgICAgIHRocmVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlYWREYXRhRnJvbURpc2tJZk5lZWRlZCk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVmcmVzaEZyb21EaXNr KToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZXNv dXJjZUxvZ0ZpbGVQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpzdGF0aXN0aWNzRmlsZVBhdGgpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OndyaXRlU3RvcmVUb0Rpc2spOgorICAgICAgICAoV2Vi S2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OndyaXRlRW5jb2RlclRvRGlzayk6 CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZGVsZXRl U3RvcmVGcm9tRGlzayk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6c3RhcnRNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UpOgorICAgICAgICAoV2Vi S2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN5bmNXaXRoRXhpc3RpbmdTdGF0 aXN0aWNzU3RvcmFnZUlmTmVlZGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpwZXJzaXN0ZW50U3RvcmFnZVBhdGgpOiBEZWxldGVkLgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKworMjAxNy0w Ny0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIE1vdmUgUmVz b3VyY2VMb2FkT2JzZXJ2ZXIgbm90aWZpY2F0aW9uIHRocm90dGxpbmcgbG9naWMgZnJvbSBXZWJQ cm9jZXNzIGNsYXNzIHRvIFJlc291cmNlTG9hZE9ic2VydmVyCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQxOTQKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNw cAppbmRleCBiNzY4NzE3YzgzM2UzZTZkOWIxOWZkMDRmMDczOTJhZjFjNDgwNmExLi45YTgwZTMy NzQ4ODU0OGIzMTljYWY1NWI0YWVkNzViMDExNjkzODE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNw cApAQCAtMjU0LDcgKzI1NCw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpyZWFkRGF0YUZyb21EaXNrSWZOZWVkZWQoKQogewogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNN YWluKCkpOwogCi0gICAgU3RyaW5nIHJlc291cmNlTG9nID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRo KEFTQ0lJTGl0ZXJhbCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgIFN0cmluZyByZXNv dXJjZUxvZyA9IHJlc291cmNlTG9nRmlsZVBhdGgoKTsKICAgICBpZiAocmVzb3VyY2VMb2cuaXNF bXB0eSgpIHx8ICFmaWxlRXhpc3RzKHJlc291cmNlTG9nKSkgewogICAgICAgICBncmFuZGZhdGhl ckV4aXN0aW5nV2Vic2l0ZURhdGEoKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjg2LDcgKzI4Niw3 IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWZyZXNoRnJvbURpc2so KQogewogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCi0gICAgU3RyaW5nIHJlc291 cmNlTG9nID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRoKEFTQ0lJTGl0ZXJhbCgiZnVsbF9icm93c2lu Z19zZXNzaW9uIikpOworICAgIFN0cmluZyByZXNvdXJjZUxvZyA9IHJlc291cmNlTG9nRmlsZVBh dGgoKTsKICAgICBpZiAocmVzb3VyY2VMb2cuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAK QEAgLTMyNiwxMyArMzI2LDE5IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjphcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUoKQogICAgIHNlbWFwaG9yZS53YWl0KFdhbGxUaW1l OjppbmZpbml0eSgpKTsKIH0KIAotU3RyaW5nIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6cGVyc2lzdGVudFN0b3JhZ2VQYXRoKGNvbnN0IFN0cmluZyYgbGFiZWwpIGNvbnN0CitTdHJp bmcgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdGF0aXN0aWNzU3RvcmFnZVBhdGgo KSBjb25zdAogewotICAgIGlmIChtX3N0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc0VtcHR5KCkpCisg ICAgcmV0dXJuIG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLmlzb2xhdGVkQ29weSgpOworfQorCitT dHJpbmcgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZXNvdXJjZUxvZ0ZpbGVQYXRo KCkgY29uc3QKK3sKKyAgICBTdHJpbmcgc3RhdGlzdGljc1N0b3JhZ2VQYXRoID0gdGhpcy0+c3Rh dGlzdGljc1N0b3JhZ2VQYXRoKCk7CisgICAgaWYgKHN0YXRpc3RpY3NTdG9yYWdlUGF0aC5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogCiAgICAgLy8gVE9ETyBEZWNp ZGUgd2hhdCB0byBjYWxsIHRoaXMgZmlsZQotICAgIHJldHVybiBwYXRoQnlBcHBlbmRpbmdDb21w b25lbnQobV9zdGF0aXN0aWNzU3RvcmFnZVBhdGgsIGxhYmVsICsgIl9yZXNvdXJjZUxvZy5wbGlz dCIpOworICAgIHJldHVybiBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoc3RhdGlzdGljc1N0b3Jh Z2VQYXRoLCAiZnVsbF9icm93c2luZ19zZXNzaW9uX3Jlc291cmNlTG9nLnBsaXN0Iik7CiB9CiAK IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZVN0b3JlVG9EaXNrKCkK QEAgLTM0Myw3ICszNDksNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 d3JpdGVTdG9yZVRvRGlzaygpCiAKICAgICBhdXRvIGVuY29kZXIgPSBjb3JlU3RvcmUoKS5jcmVh dGVFbmNvZGVyRnJvbURhdGEoKTsKIAotICAgIFN0cmluZyByZXNvdXJjZUxvZyA9IHBlcnNpc3Rl bnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbiIpKTsKKyAg ICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgd3JpdGVF bmNvZGVyVG9EaXNrKCplbmNvZGVyLmdldCgpLCByZXNvdXJjZUxvZyk7CiAKICAgICBtX2xhc3RT dGF0aXN0aWNzRmlsZVN5bmNUaW1lID0gV2FsbFRpbWU6Om5vdygpOwpAQCAtMzgyLDggKzM4OCw5 IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjp3cml0ZUVuY29kZXJUb0Rp c2soS2V5ZWRFbmNvZGVyJiBlbmNvZGVyLCBjCiAgICAgaWYgKCFyYXdEYXRhKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBpZiAoIW1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgewot ICAgICAgICBtYWtlQWxsRGlyZWN0b3JpZXMobV9zdGF0aXN0aWNzU3RvcmFnZVBhdGgpOworICAg IGF1dG8gc3RhdGlzdGljc1N0b3JhZ2VQYXRoID0gdGhpcy0+c3RhdGlzdGljc1N0b3JhZ2VQYXRo KCk7CisgICAgaWYgKCFzdGF0aXN0aWNzU3RvcmFnZVBhdGguaXNFbXB0eSgpKSB7CisgICAgICAg IG1ha2VBbGxEaXJlY3RvcmllcyhzdGF0aXN0aWNzU3RvcmFnZVBhdGgpOwogICAgICAgICBwbGF0 Zm9ybUV4Y2x1ZGVGcm9tQmFja3VwKCk7CiAgICAgfQogCkBAIC00MDEsNyArNDA4LDcgQEAgdm9p ZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OndyaXRlRW5jb2RlclRvRGlzayhLZXll ZEVuY29kZXImIGVuY29kZXIsIGMKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpkZWxldGVTdG9yZUZyb21EaXNrKCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigp KTsKLSAgICBTdHJpbmcgcmVzb3VyY2VMb2dQYXRoID0gcGVyc2lzdGVudFN0b3JhZ2VQYXRoKEFT Q0lJTGl0ZXJhbCgiZnVsbF9icm93c2luZ19zZXNzaW9uIikpOworICAgIFN0cmluZyByZXNvdXJj ZUxvZ1BhdGggPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAgICAgaWYgKHJlc291cmNlTG9nUGF0 aC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtNDIzLDcgKzQzMCw3IEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdGFydE1vbml0b3JpbmdTdGF0aXN0aWNz U3RvcmFnZSgpCiAgICAgaWYgKG1fc3RhdGlzdGljc1N0b3JhZ2VNb25pdG9yKQogICAgICAgICBy ZXR1cm47CiAgICAgCi0gICAgU3RyaW5nIHJlc291cmNlTG9nUGF0aCA9IHBlcnNpc3RlbnRTdG9y YWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbiIpKTsKKyAgICBTdHJp bmcgcmVzb3VyY2VMb2dQYXRoID0gcmVzb3VyY2VMb2dGaWxlUGF0aCgpOwogICAgIGlmIChyZXNv dXJjZUxvZ1BhdGguaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAgICAgCkBAIC00NjEsNyAr NDY4LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN5bmNXaXRoRXhp c3RpbmdTdGF0aXN0aWNzU3RvcmFnZUlmTmVlZGVkKCkKICAgICBpZiAobV9zdGF0aXN0aWNzU3Rv cmFnZU1vbml0b3IpCiAgICAgICAgIHJldHVybjsKIAotICAgIFN0cmluZyByZXNvdXJjZUxvZyA9 IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChBU0NJSUxpdGVyYWwoImZ1bGxfYnJvd3Npbmdfc2Vzc2lv biIpKTsKKyAgICBTdHJpbmcgcmVzb3VyY2VMb2cgPSByZXNvdXJjZUxvZ0ZpbGVQYXRoKCk7CiAg ICAgaWYgKHJlc291cmNlTG9nLmlzRW1wdHkoKSB8fCAhZmlsZUV4aXN0cyhyZXNvdXJjZUxvZykp CiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IDAzYzk2ZDQ3NDMxNzNi NmViMzdjNzNhMDRmYWJhZTE2MjQ0N2NiNTQuLmMxYTM5Njg3YTA2MjE1NzBlOGYyNWM2MTMyMDY4 MjUwMjViYjAyYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTExMyw3ICsxMTMsOCBAQCBwcml2 YXRlOgogICAgIHZvaWQgc3RhcnRNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKTsKICAgICB2 b2lkIHN0b3BNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKTsKIAotICAgIFN0cmluZyBwZXJz aXN0ZW50U3RvcmFnZVBhdGgoY29uc3QgU3RyaW5nJiBsYWJlbCkgY29uc3Q7CisgICAgU3RyaW5n IHN0YXRpc3RpY3NTdG9yYWdlUGF0aCgpIGNvbnN0OworICAgIFN0cmluZyByZXNvdXJjZUxvZ0Zp bGVQYXRoKCkgY29uc3Q7CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZvaWQg ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJp ZGU7CkBAIC0xNDUsNyArMTQ2LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIFJlZjxXVEY6Oldv cmtRdWV1ZT4gbV9zdGF0aXN0aWNzUXVldWU7CiAgICAgUmVmUHRyPFdlYkNvcmU6OkZpbGVNb25p dG9yPiBtX3N0YXRpc3RpY3NTdG9yYWdlTW9uaXRvcjsKLSAgICBTdHJpbmcgbV9zdGF0aXN0aWNz U3RvcmFnZVBhdGg7CisgICAgY29uc3QgU3RyaW5nIG1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoOwog ICAgIFdURjo6V2FsbFRpbWUgbV9sYXN0U3RhdGlzdGljc0ZpbGVTeW5jVGltZTsKICAgICBSdW5M b29wOjpUaW1lcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IG1fdGVsZW1ldHJ5T25l U2hvdFRpbWVyOwogICAgIFJ1bkxvb3A6OlRpbWVyPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZT4gbV90ZWxlbWV0cnlSZXBlYXRlZFRpbWVyOwo=