133921 2014-06-14 16:06:29 -0700 invalidateCallbackMap doesn’t pass the error parameter on to invalidate(), so script completion handler is passed the wrong error 2014-06-15 11:07:36 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P1 Normal --- 1 mitz andersca andersca commit-queue eric.carlson glenn jer.noble philipj sergio oldest_to_newest 1015730 0 mitz 2014-06-14 16:06:29 -0700 invalidateCallbackMap in GenericCallback.h doesn’t pass its error parameter on to the callbacks’ invalidate function. Therefore the error passed into -[WKWebView evaluateJavaScript:completionHandler:]’s completion handler is always WKErrorUnknown, and the completion handler is called synchronously in the PageInvalidated case, even though it’s supposed to be deferred. 1015731 1 mitz 2014-06-14 16:08:25 -0700 <rdar://problem/17316653> 1015768 2 233141 andersca 2014-06-15 10:24:07 -0700 Created attachment 233141 Patch 1015769 3 andersca 2014-06-15 11:07:36 -0700 Committed r169990: <http://trac.webkit.org/changeset/169990> 233141 2014-06-15 10:24:07 -0700 2014-06-15 10:27:59 -0700 Patch bug-133921-20140615102344.patch text/plain 16439 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWM0YjdhNTVkZGNkMjAz ZmViMDAwZGI3ZmU0MTEyYTlhZDIyZTkyYS4uZGIxMTcwNzE0OWI4OTNiZjIxNjJhOTkxMGE5ZmFk NDkxNWQ4ZDk4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTA2LTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgaW52YWxpZGF0ZUNh bGxiYWNrTWFwIGRvZXNu4oCZdCBwYXNzIHRoZSBlcnJvciBwYXJhbWV0ZXIgb24gdG8gaW52YWxp ZGF0ZSgpLCBzbyBzY3JpcHQgY29tcGxldGlvbiBoYW5kbGVyIGlzIHBhc3NlZCB0aGUgd3Jvbmcg ZXJyb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MzkyMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTczMTY2NTM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvR2VuZXJpY0NhbGxi YWNrLmg6CisgICAgICAgIChXZWJLaXQ6OlZvaWRDYWxsYmFjazo6cGVyZm9ybUNhbGxiYWNrKToK KyAgICAgICAgKFdlYktpdDo6Vm9pZENhbGxiYWNrOjppbnZhbGlkYXRlKToKKyAgICAgICAgKFdl YktpdDo6Vm9pZEFQSUNhbGxiYWNrOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjppbnZhbGlk YXRlQ2FsbGJhY2tNYXApOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNp dGVEYXRhTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpblNpdGVEYXRhTWFu YWdlcjo6aW52YWxpZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpblNpdGVEYXRhTWFu YWdlcjo6Y2xlYXJTaXRlRGF0YSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkFwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNh Y2hlTWFuYWdlclByb3h5Ojpjb250ZXh0RGVzdHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6V2Vi QXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eTo6cHJvY2Vzc0RpZENsb3NlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6 On5XZWJDb250ZXh0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5Ojpjb250ZXh0RGVz dHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5Ojpwcm9jZXNz RGlkQ2xvc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJEYXRhYmFzZU1hbmFnZXJQcm94eS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFiYXNlTWFuYWdlclByb3h5Ojpjb250ZXh0RGVz dHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OnByb2Nl c3NEaWRDbG9zZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5Ojpjb250 ZXh0RGVzdHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94 eTo6cHJvY2Vzc0RpZENsb3NlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViT3JpZ2luRGF0YU1h bmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk9yaWdpbkRhdGFNYW5hZ2VyUHJv eHk6OmNvbnRleHREZXN0cm95ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJPcmlnaW5EYXRhTWFu YWdlclByb3h5Ojpwcm9jZXNzRGlkQ2xvc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZvcmNlUmVwYWludCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5Ojpjb250ZXh0RGVzdHJveWVkKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eTo6cHJvY2Vzc0RpZENs b3NlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIubW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZGVhbGxvY10p OgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGZpbmlzaGVkRXhpdEZ1 bGxTY3JlZW5BbmltYXRpb246XSk6CisKIDIwMTQtMDYtMTUgIFphbiBEb2JlcnNlayAgPHpkb2Jl cnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciB0aGUg R1RLKyBwb3J0IGFmdGVyIHIxNjk5ODcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvR2VuZXJpY0NhbGxiYWNrLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvR2VuZXJp Y0NhbGxiYWNrLmgKaW5kZXggN2RkMzczZTYzNTlkOWQ3MGQwMDk4ZDY3Yzc4YmUwYmZhNGNlMmI5 My4uY2UxZGNjNmQ2YzYzMmVmOWY0MWE5OGUxNDU5MzdmZWE2M2M0NDc1MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0dlbmVyaWNDYWxsYmFjay5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9HZW5lcmljQ2FsbGJhY2suaApAQCAtNzEsNyArNzEsNyBAQCBwcml2 YXRlOgogCiBjbGFzcyBWb2lkQ2FsbGJhY2sgOiBwdWJsaWMgQ2FsbGJhY2tCYXNlIHsKIHB1Ymxp YzoKLSAgICB0eXBlZGVmIHN0ZDo6ZnVuY3Rpb248dm9pZCAoYm9vbCk+IENhbGxiYWNrRnVuY3Rp b247CisgICAgdHlwZWRlZiBzdGQ6OmZ1bmN0aW9uPHZvaWQgKEVycm9yKT4gQ2FsbGJhY2tGdW5j dGlvbjsKIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFZvaWRDYWxsYmFjaz4gY3JlYXRlKENhbGxi YWNrRnVuY3Rpb24gY2FsbGJhY2spCiAgICAgewpAQCAtODgsMTcgKzg4LDE3IEBAIHB1YmxpYzoK ICAgICAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAg IG1fY2FsbGJhY2soZmFsc2UpOworICAgICAgICBtX2NhbGxiYWNrKEVycm9yOjpOb25lKTsKIAog ICAgICAgICBtX2NhbGxiYWNrID0gbnVsbHB0cjsKICAgICB9CiAgICAgCi0gICAgdm9pZCBpbnZh bGlkYXRlKCkKKyAgICB2b2lkIGludmFsaWRhdGUoRXJyb3IgZXJyb3IpCiAgICAgewogICAgICAg ICBpZiAoIW1fY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbV9jYWxs YmFjayh0cnVlKTsKKyAgICAgICAgbV9jYWxsYmFjayhlcnJvcik7CiAKICAgICAgICAgbV9jYWxs YmFjayA9IG51bGxwdHI7CiAgICAgfQpAQCAtMTE4LDggKzExOCw4IEBAIHB1YmxpYzoKIAogICAg IHN0YXRpYyBQYXNzUmVmUHRyPFZvaWRDYWxsYmFjaz4gY3JlYXRlKHZvaWQqIGNvbnRleHQsIENh bGxiYWNrRnVuY3Rpb24gY2FsbGJhY2spCiAgICAgewotICAgICAgICByZXR1cm4gVm9pZENhbGxi YWNrOjpjcmVhdGUoW2NvbnRleHQsIGNhbGxiYWNrXShib29sIGVycm9yKSB7Ci0gICAgICAgICAg ICBjYWxsYmFjayhlcnJvciA/IHRvQVBJKEFQSTo6RXJyb3I6OmNyZWF0ZSgpLmdldCgpKSA6IDAs IGNvbnRleHQpOworICAgICAgICByZXR1cm4gVm9pZENhbGxiYWNrOjpjcmVhdGUoW2NvbnRleHQs IGNhbGxiYWNrXShFcnJvciBlcnJvcikgeworICAgICAgICAgICAgY2FsbGJhY2soZXJyb3IgIT0g RXJyb3I6Ok5vbmUgPyB0b0FQSShBUEk6OkVycm9yOjpjcmVhdGUoKS5nZXQoKSkgOiAwLCBjb250 ZXh0KTsKICAgICAgICAgfSk7CiAgICAgfQogfTsKQEAgLTE4MCwxMyArMTgwLDE0IEBAIHR5cGVk ZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpJbnRSZWN0PiYsIGRvdWJs ZT4gQ29tcHV0ZWRQYWdlc0NhCiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxjb25zdCBTaGFyZWFi bGVCaXRtYXA6OkhhbmRsZSY+IEltYWdlQ2FsbGJhY2s7CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ Ci12b2lkIGludmFsaWRhdGVDYWxsYmFja01hcChIYXNoTWFwPHVpbnQ2NF90LCBUPiYgbWFwLCBD YWxsYmFja0Jhc2U6OkVycm9yIGVycm9yID0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6VW5rbm93bikK K3ZvaWQgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKEhhc2hNYXA8dWludDY0X3QsIFQ+JiBjYWxsYmFj a01hcCwgQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikKIHsKLSAgICBWZWN0b3I8VD4gY2FsbGJh Y2tzVmVjdG9yOwotICAgIGNvcHlWYWx1ZXNUb1ZlY3RvcihtYXAsIGNhbGxiYWNrc1ZlY3Rvcik7 Ci0gICAgZm9yIChzaXplX3QgaSA9IDAsIHNpemUgPSBjYWxsYmFja3NWZWN0b3Iuc2l6ZSgpOyBp IDwgc2l6ZTsgKytpKQotICAgICAgICBjYWxsYmFja3NWZWN0b3JbaV0tPmludmFsaWRhdGUoKTsK LSAgICBtYXAuY2xlYXIoKTsKKyAgICBWZWN0b3I8VD4gY2FsbGJhY2tzOworICAgIGNvcHlWYWx1 ZXNUb1ZlY3RvcihjYWxsYmFja01hcCwgY2FsbGJhY2tzKTsKKyAgICBmb3IgKGF1dG8mIGNhbGxi YWNrIDogY2FsbGJhY2tzKQorICAgICAgICBjYWxsYmFjay0+aW52YWxpZGF0ZShlcnJvcik7CisK KyAgICBjYWxsYmFja01hcC5jbGVhcigpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVE YXRhTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9XZWJQbHVn aW5TaXRlRGF0YU1hbmFnZXIuY3BwCmluZGV4IGI4ZTY4MWJhMzNiZTkzMGFhMWNkNGRlZDIyZTdh NmU0ODM1ZGZiNzAuLjUyYzE1MTM0NGFkNjVhNmZmNWI1ZDZjNWE5Mzc2MDllOGVjNDUzNWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVE YXRhTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvV2Vi UGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcApAQCAtMTMyLDcgKzEzMiw3IEBAIFdlYlBsdWdpblNp dGVEYXRhTWFuYWdlcjo6fldlYlBsdWdpblNpdGVEYXRhTWFuYWdlcigpCiAKIHZvaWQgV2ViUGx1 Z2luU2l0ZURhdGFNYW5hZ2VyOjppbnZhbGlkYXRlKCkKIHsKLSAgICBpbnZhbGlkYXRlQ2FsbGJh Y2tNYXAobV9hcnJheUNhbGxiYWNrcyk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fYXJy YXlDYWxsYmFja3MsIENhbGxiYWNrQmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQpOwog CiAgICAgbV9wZW5kaW5nR2V0U2l0ZXNXaXRoRGF0YS5jbGVhcigpOwogICAgIG1fcGVuZGluZ0Ns ZWFyU2l0ZURhdGEuY2xlYXIoKTsKQEAgLTE3Miw3ICsxNzIsOCBAQCB2b2lkIFdlYlBsdWdpblNp dGVEYXRhTWFuYWdlcjo6Y2xlYXJTaXRlRGF0YShBUEk6OkFycmF5KiBzaXRlcywgdWludDY0X3Qg ZmxhZ3MsCiB7CiAgICAgUmVmUHRyPFZvaWRDYWxsYmFjaz4gY2FsbGJhY2sgPSBwcnBDYWxsYmFj azsKICAgICBpZiAoIW1fd2ViQ29udGV4dCkgewotICAgICAgICBjYWxsYmFjay0+aW52YWxpZGF0 ZSgpOworICAgICAgICAvLyBGSVhNRTogSWYgdGhlIGNvbnRleHQgaXMgaW52YWxpZCB3ZSBzaG91 bGQgbm90IGNhbGwgdGhlIGNhbGxiYWNrLiBJdCdkIGJlIGJldHRlciB0byBqdXN0IHJldHVybiBm YWxzZSBmcm9tIGNsZWFyU2l0ZURhdGEuCisgICAgICAgIGNhbGxiYWNrLT5pbnZhbGlkYXRlKENh bGxiYWNrQmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQXBwbGlj YXRpb25DYWNoZU1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi QXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eS5jcHAKaW5kZXggZGNiODEzN2ViZThiOTJiMDYz NWZlYTI0ZmY4Mjg1ZWU1MjlmYzYxNS4uNmFjOTBlNzFlZWMyN2ZkNjIzMTM2ZTU0NzUyODhiZDA1 NzA5Y2Y1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkFwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5LmNwcApAQCAtNTcsMTIgKzU3LDEyIEBAIFdl YkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk6On5XZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdl clByb3h5KCkKIAogdm9pZCBXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5Ojpjb250ZXh0 RGVzdHJveWVkKCkKIHsKLSAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNr cyk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fYXJyYXlDYWxsYmFja3MsIENhbGxiYWNr QmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQpOwogfQogCiB2b2lkIFdlYkFwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OnByb2Nlc3NEaWRDbG9zZShXZWJQcm9jZXNzUHJveHkqKQog ewotICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2FsbGJhY2tzKTsKKyAgICBpbnZh bGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcywgQ2FsbGJhY2tCYXNlOjpFcnJvcjo6 UHJvY2Vzc0V4aXRlZCk7CiB9CiAKIGJvb2wgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94 eTo6c2hvdWxkVGVybWluYXRlKFdlYlByb2Nlc3NQcm94eSopIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKaW5kZXggNTE4Yjk1NzI5ZjBhOTI5YWQzMjMxY2QxZDAw Y2FmNzI2YTU2OTRhOC4uOWQyMzdjY2IwYjc2MjU5ZGM0ZjUyM2U3MGY1YTEwYjRhNDNhNDUyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcApAQCAtMjYyLDcgKzI2Miw3 IEBAIFdlYkNvbnRleHQ6On5XZWJDb250ZXh0KCkKICAgICBtX3BsdWdpblNpdGVEYXRhTWFuYWdl ci0+Y2xlYXJDb250ZXh0KCk7CiAjZW5kaWYKIAotICAgIGludmFsaWRhdGVDYWxsYmFja01hcCht X2RpY3Rpb25hcnlDYWxsYmFja3MpOworICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2RpY3Rp b25hcnlDYWxsYmFja3MsIENhbGxiYWNrQmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQp OwogCiAgICAgcGxhdGZvcm1JbnZhbGlkYXRlQ29udGV4dCgpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuY3BwCmluZGV4IGU2ZGJkYWRh ZTFjOWNhYmFiNTljY2Q3MjRlZDI5ZmFkOTc1MmE0YTAuLmI3YWQ5Y2ZlODlhYjQxZjcxNDc3MjMy ZmMyOTc2YzIwMGE2ZWQ5MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb29raWVNYW5hZ2VyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb29raWVNYW5hZ2VyUHJveHkuY3BwCkBAIC02NywyMCArNjcsMjAgQEAgdm9pZCBXZWJDb29r aWVNYW5hZ2VyUHJveHk6OmluaXRpYWxpemVDbGllbnQoY29uc3QgV0tDb29raWVNYW5hZ2VyQ2xp ZW50QmFzZSogY2wKIAogdm9pZCBXZWJDb29raWVNYW5hZ2VyUHJveHk6OmNvbnRleHREZXN0cm95 ZWQoKQogewotICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2FsbGJhY2tzKTsKLSAg ICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9odHRwQ29va2llQWNjZXB0UG9saWN5Q2FsbGJhY2tz KTsKKyAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcywgQ2FsbGJhY2tC YXNlOjpFcnJvcjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNr TWFwKG1faHR0cENvb2tpZUFjY2VwdFBvbGljeUNhbGxiYWNrcywgQ2FsbGJhY2tCYXNlOjpFcnJv cjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7CiB9CiAKIHZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5 Ojpwcm9jZXNzRGlkQ2xvc2UoV2ViUHJvY2Vzc1Byb3h5KikKIHsKLSAgICBpbnZhbGlkYXRlQ2Fs bGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcyk7Ci0gICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1f aHR0cENvb2tpZUFjY2VwdFBvbGljeUNhbGxiYWNrcyk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNr TWFwKG1fYXJyYXlDYWxsYmFja3MsIENhbGxiYWNrQmFzZTo6RXJyb3I6OlByb2Nlc3NFeGl0ZWQp OworICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2h0dHBDb29raWVBY2NlcHRQb2xpY3lDYWxs YmFja3MsIENhbGxiYWNrQmFzZTo6RXJyb3I6OlByb2Nlc3NFeGl0ZWQpOwogfQogCiB2b2lkIFdl YkNvb2tpZU1hbmFnZXJQcm94eTo6cHJvY2Vzc0RpZENsb3NlKE5ldHdvcmtQcm9jZXNzUHJveHkq KQogewotICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2FsbGJhY2tzKTsKLSAgICBp bnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9odHRwQ29va2llQWNjZXB0UG9saWN5Q2FsbGJhY2tzKTsK KyAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcywgQ2FsbGJhY2tCYXNl OjpFcnJvcjo6UHJvY2Vzc0V4aXRlZCk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1faHR0 cENvb2tpZUFjY2VwdFBvbGljeUNhbGxiYWNrcywgQ2FsbGJhY2tCYXNlOjpFcnJvcjo6UHJvY2Vz c0V4aXRlZCk7CiB9CiAKIGJvb2wgV2ViQ29va2llTWFuYWdlclByb3h5OjpzaG91bGRUZXJtaW5h dGUoV2ViUHJvY2Vzc1Byb3h5KikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJEYXRhYmFzZU1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwCmluZGV4IGFmYTdkYzhlNzQ5MzljMGE3 MDFlNzM5OGU3YmZkNTljYTJjYjY2NzguLjk4ZDQ2NDY0MDZlZTJjOTU5YzZhNjU4OGRhNWIxMzgy ODEzYjc1NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJEYXRhYmFz ZU1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkRhdGFi YXNlTWFuYWdlclByb3h5LmNwcApAQCAtMTI5LDEyICsxMjksMTIgQEAgdm9pZCBXZWJEYXRhYmFz ZU1hbmFnZXJQcm94eTo6aW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS0RhdGFiYXNlTWFuYWdlckNs aWVudEJhc2UKIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Y29udGV4dERlc3Ryb3ll ZCgpCiB7Ci0gICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fYXJyYXlDYWxsYmFja3MpOworICAg IGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2FsbGJhY2tzLCBDYWxsYmFja0Jhc2U6OkVy cm9yOjpPd25lcldhc0ludmFsaWRhdGVkKTsKIH0KIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQ cm94eTo6cHJvY2Vzc0RpZENsb3NlKFdlYlByb2Nlc3NQcm94eSopCiB7Ci0gICAgaW52YWxpZGF0 ZUNhbGxiYWNrTWFwKG1fYXJyYXlDYWxsYmFja3MpOworICAgIGludmFsaWRhdGVDYWxsYmFja01h cChtX2FycmF5Q2FsbGJhY2tzLCBDYWxsYmFja0Jhc2U6OkVycm9yOjpQcm9jZXNzRXhpdGVkKTsK IH0KIAogYm9vbCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6c2hvdWxkVGVybWluYXRlKFdlYlBy b2Nlc3NQcm94eSopIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eS5jcHAKaW5kZXggNzgxYTdmMDdhNmEzMWQ5N2E3ZDJi ZTRhMjdhYWY5YTgwOWRlZmU3ZS4uNWQzYTE2MmU1ZTlhOGM4N2RjZGM1YjJmZDEyM2U2ZGIzMDY4 NTRiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhQ2FjaGVN YW5hZ2VyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJNZWRpYUNh Y2hlTWFuYWdlclByb3h5LmNwcApAQCAtNTgsMTIgKzU4LDEyIEBAIFdlYk1lZGlhQ2FjaGVNYW5h Z2VyUHJveHk6On5XZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5KCkKIAogdm9pZCBXZWJNZWRpYUNh Y2hlTWFuYWdlclByb3h5Ojpjb250ZXh0RGVzdHJveWVkKCkKIHsKLSAgICBpbnZhbGlkYXRlQ2Fs bGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcyk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1f YXJyYXlDYWxsYmFja3MsIENhbGxiYWNrQmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQp OwogfQogCiB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk6OnByb2Nlc3NEaWRDbG9zZShX ZWJQcm9jZXNzUHJveHkqKQogewotICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2Fs bGJhY2tzKTsKKyAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcywgQ2Fs bGJhY2tCYXNlOjpFcnJvcjo6UHJvY2Vzc0V4aXRlZCk7CiB9CiAKIGJvb2wgV2ViTWVkaWFDYWNo ZU1hbmFnZXJQcm94eTo6c2hvdWxkVGVybWluYXRlKFdlYlByb2Nlc3NQcm94eSopIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViT3JpZ2luRGF0YU1hbmFnZXJQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViT3JpZ2luRGF0YU1hbmFnZXJQ cm94eS5jcHAKaW5kZXggMTU5NWQxYmFlNzRhMGMwMDQ5MDU4N2YzYmRmYjVjYWNlN2ZlZGU4Mi4u NzEyZGM4OGM3NjMwN2NmMjMxNWI4OWQwNmM5ZWVhMGVlOTljMDRkZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk9yaWdpbkRhdGFNYW5hZ2VyUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJPcmlnaW5EYXRhTWFuYWdlclByb3h5LmNwcApA QCAtNTcsMTIgKzU3LDEyIEBAIFdlYk9yaWdpbkRhdGFNYW5hZ2VyUHJveHk6On5XZWJPcmlnaW5E YXRhTWFuYWdlclByb3h5KCkKIAogdm9pZCBXZWJPcmlnaW5EYXRhTWFuYWdlclByb3h5Ojpjb250 ZXh0RGVzdHJveWVkKCkKIHsKLSAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxi YWNrcyk7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fYXJyYXlDYWxsYmFja3MsIENhbGxi YWNrQmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQpOwogfQogCiB2b2lkIFdlYk9yaWdp bkRhdGFNYW5hZ2VyUHJveHk6OnByb2Nlc3NEaWRDbG9zZShXZWJQcm9jZXNzUHJveHkqKQogewot ICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2FsbGJhY2tzKTsKKyAgICBpbnZhbGlk YXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcywgQ2FsbGJhY2tCYXNlOjpFcnJvcjo6UHJv Y2Vzc0V4aXRlZCk7CiB9CiAKIGJvb2wgV2ViT3JpZ2luRGF0YU1hbmFnZXJQcm94eTo6c2hvdWxk VGVybWluYXRlKFdlYlByb2Nlc3NQcm94eSopIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDE4NTY4N2FmOWMxMjRiZDQxYjFmYWQxNjRlNzhmNmNi OGI4YmM3OGIuLjAwZDgzYjljMGJlNzJmMGEwZTljMDZhZDNiZmI2Mjg2Y2Y5ZjJiMjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0yMzM1LDcgKzIzMzUs OCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Zm9yY2VSZXBhaW50KFBhc3NSZWZQdHI8Vm9pZENhbGxi YWNrPiBwcnBDYWxsYmFjaykKIHsKICAgICBSZWZQdHI8Vm9pZENhbGxiYWNrPiBjYWxsYmFjayA9 IHBycENhbGxiYWNrOwogICAgIGlmICghaXNWYWxpZCgpKSB7Ci0gICAgICAgIGNhbGxiYWNrLT5p bnZhbGlkYXRlKCk7CisgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgcGFnZSBpcyBpbnZhbGlkIHdl IHNob3VsZCBub3QgY2FsbCB0aGUgY2FsbGJhY2suIEl0J2QgYmUgYmV0dGVyIHRvIGp1c3QgcmV0 dXJuIGZhbHNlIGZyb20gZm9yY2VSZXBhaW50LgorICAgICAgICBjYWxsYmFjay0+aW52YWxpZGF0 ZShDYWxsYmFja0Jhc2U6OkVycm9yOjpPd25lcldhc0ludmFsaWRhdGVkKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtNDI3OCwxOSArNDI3OSwxOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiAgICAgICAgIGJy ZWFrOwogICAgIH0KIAotICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3ZvaWRDYWxsYmFja3Mp OwotICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2RhdGFDYWxsYmFja3MpOwotICAgIGludmFs aWRhdGVDYWxsYmFja01hcChtX2ltYWdlQ2FsbGJhY2tzKTsKLSAgICBpbnZhbGlkYXRlQ2FsbGJh Y2tNYXAobV9zdHJpbmdDYWxsYmFja3MpOworICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3Zv aWRDYWxsYmFja3MsIGVycm9yKTsKKyAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9kYXRhQ2Fs bGJhY2tzLCBlcnJvcik7CisgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1faW1hZ2VDYWxsYmFj a3MsIGVycm9yKTsKKyAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9zdHJpbmdDYWxsYmFja3Ms IGVycm9yKTsKICAgICBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxsYmFja0lEcy5jbGVhcigpOwog ICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3NjcmlwdFZhbHVlQ2FsbGJhY2tzLCBlcnJvcik7 Ci0gICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fY29tcHV0ZWRQYWdlc0NhbGxiYWNrcyk7Ci0g ICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fdmFsaWRhdGVDb21tYW5kQ2FsbGJhY2tzKTsKLSAg ICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV91bnNpZ25lZENhbGxiYWNrcyk7Ci0gICAgaW52YWxp ZGF0ZUNhbGxiYWNrTWFwKG1fZWRpdGluZ1JhbmdlQ2FsbGJhY2tzKTsKLSAgICBpbnZhbGlkYXRl Q2FsbGJhY2tNYXAobV9yZWN0Rm9yQ2hhcmFjdGVyUmFuZ2VDYWxsYmFja3MpOworICAgIGludmFs aWRhdGVDYWxsYmFja01hcChtX2NvbXB1dGVkUGFnZXNDYWxsYmFja3MsIGVycm9yKTsKKyAgICBp bnZhbGlkYXRlQ2FsbGJhY2tNYXAobV92YWxpZGF0ZUNvbW1hbmRDYWxsYmFja3MsIGVycm9yKTsK KyAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV91bnNpZ25lZENhbGxiYWNrcywgZXJyb3IpOwor ICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2VkaXRpbmdSYW5nZUNhbGxiYWNrcywgZXJyb3Ip OworICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3JlY3RGb3JDaGFyYWN0ZXJSYW5nZUNhbGxi YWNrcywgZXJyb3IpOwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBpbnZhbGlkYXRlQ2FsbGJhY2tN YXAobV9hdHRyaWJ1dGVkU3RyaW5nRm9yQ2hhcmFjdGVyUmFuZ2VDYWxsYmFja3MpOworICAgIGlu dmFsaWRhdGVDYWxsYmFja01hcChtX2F0dHJpYnV0ZWRTdHJpbmdGb3JDaGFyYWN0ZXJSYW5nZUNh bGxiYWNrcywgZXJyb3IpOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIGludmFsaWRh dGVDYWxsYmFja01hcChtX2dlc3R1cmVDYWxsYmFja3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCmluZGV4 IDc2OTE4MTJmZDdlMzJiZTJmZmMzNGRiYzdmN2NlYmVkYmVhMTkxNzAuLjljN2QyMTgwZDA0MDk0 ZDkzNjI1YzkxYzcxOWM3ODdmNWQ0NjMyMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHAKQEAgLTY1LDEy ICs2NSwxMiBAQCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5Ojp+V2ViUmVzb3VyY2VDYWNo ZU1hbmFnZXJQcm94eSgpCiAKIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eTo6Y29u dGV4dERlc3Ryb3llZCgpCiB7Ci0gICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fYXJyYXlDYWxs YmFja3MpOworICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2FycmF5Q2FsbGJhY2tzLCBDYWxs YmFja0Jhc2U6OkVycm9yOjpPd25lcldhc0ludmFsaWRhdGVkKTsKIH0KIAogdm9pZCBXZWJSZXNv dXJjZUNhY2hlTWFuYWdlclByb3h5Ojpwcm9jZXNzRGlkQ2xvc2UoV2ViUHJvY2Vzc1Byb3h5KikK IHsKLSAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9hcnJheUNhbGxiYWNrcyk7CisgICAgaW52 YWxpZGF0ZUNhbGxiYWNrTWFwKG1fYXJyYXlDYWxsYmFja3MsIENhbGxiYWNrQmFzZTo6RXJyb3I6 OlByb2Nlc3NFeGl0ZWQpOwogfQogCiBib29sIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6 OnNob3VsZFRlcm1pbmF0ZShXZWJQcm9jZXNzUHJveHkqKSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVyLm1tCmluZGV4IGU5OWE3MzQyZGRlOGI3NTU2NjQyMDJjZmRlOWVjODVmNjVkYjZhNjIuLmUx NzM0MTJkNjZhMWMzYTA1MzM2MWExZWRhYTViZDM4ZjhjM2MwMGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXIubW0KQEAgLTExMSw3ICsxMTEsNyBAQCBzdGF0aWMgdm9pZCBtYWtlUmVzcG9uZGVyRmly c3RSZXNwb25kZXJJZkRlc2NlbmRhbnRPZlZpZXcoTlNXaW5kb3cgKndpbmRvdywgTlNSZQogICAg IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2Vs Zl07CiAKICAgICBpZiAoX3JlcGFpbnRDYWxsYmFjaykgewotICAgICAgICBfcmVwYWludENhbGxi YWNrLT5pbnZhbGlkYXRlKCk7CisgICAgICAgIF9yZXBhaW50Q2FsbGJhY2stPmludmFsaWRhdGUo Q2FsbGJhY2tCYXNlOjpFcnJvcjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7CiAgICAgICAgIC8vIGlu dmFsaWRhdGUoKSBjYWxscyBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0 ZXJSZXBhaW50LCB3aGljaAogICAgICAgICAvLyBjbGVhcnMgX3JlcGFpbnRDYWxsYmFjay4KICAg ICAgICAgQVNTRVJUKCFfcmVwYWludENhbGxiYWNrKTsKQEAgLTQwOSwxMiArNDA5LDEyIEBAIHN0 YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY3JlYXRlSW1hZ2VXaXRoQ29waWVkRGF0YShDR0lt YWdlUmVmIHNvdXJjZUltYWdlKQogICAgIFtzZWxmIF9tYW5hZ2VyXS0+cmVzdG9yZVNjcm9sbFBv c2l0aW9uKCk7CiAKICAgICBpZiAoX3JlcGFpbnRDYWxsYmFjaykgewotICAgICAgICBfcmVwYWlu dENhbGxiYWNrLT5pbnZhbGlkYXRlKCk7CisgICAgICAgIF9yZXBhaW50Q2FsbGJhY2stPmludmFs aWRhdGUoQ2FsbGJhY2tCYXNlOjpFcnJvcjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7CiAgICAgICAg IC8vIGludmFsaWRhdGUoKSBjYWxscyBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0 aW9uQWZ0ZXJSZXBhaW50LCB3aGljaAogICAgICAgICAvLyBjbGVhcnMgX3JlcGFpbnRDYWxsYmFj ay4KICAgICAgICAgQVNTRVJUKCFfcmVwYWludENhbGxiYWNrKTsKICAgICB9Ci0gICAgX3JlcGFp bnRDYWxsYmFjayA9IFZvaWRDYWxsYmFjazo6Y3JlYXRlKFtzZWxmXShib29sKSB7CisgICAgX3Jl cGFpbnRDYWxsYmFjayA9IFZvaWRDYWxsYmFjazo6Y3JlYXRlKFtzZWxmXShDYWxsYmFja0Jhc2U6 OkVycm9yKSB7CiAgICAgICAgIFtzZWxmIGNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5Bbmlt YXRpb25BZnRlclJlcGFpbnRdOwogICAgIH0pOwogICAgIFtzZWxmIF9wYWdlXS0+Zm9yY2VSZXBh aW50KF9yZXBhaW50Q2FsbGJhY2spOwo=