192967 2018-12-20 18:15:04 -0800 NetworkProcess should initialize its default NetworkSession with parameters from the UIProcess 2019-01-03 08:52:41 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 1 achristensen achristensen bfulgham thorton oldest_to_newest 1490239 0 achristensen 2018-12-20 18:15:04 -0800 NetworkProcess should initialize its default NetworkSession with parameters from the UIProcess 1490240 1 357912 achristensen 2018-12-20 18:15:16 -0800 Created attachment 357912 Patch 1490241 2 357912 achristensen 2018-12-20 18:16:14 -0800 Comment on attachment 357912 Patch This first patch isn't quite right, but it's headed in the right direction. For example, the WebKit.WKHTTPCookieStore API test asserts. 1490418 3 357961 achristensen 2018-12-21 11:40:29 -0800 Created attachment 357961 Patch 1491434 4 357961 bfulgham 2019-01-03 08:49:33 -0800 Comment on attachment 357961 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357961&action=review Looks good to me. > Source/WebKit/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=192967 Radar? > Source/WebKit/ChangeLog:9 > + More will be moved in the near future, like indexedDatabaseDirectory. Good! 1491437 5 achristensen 2019-01-03 08:52:41 -0800 http://trac.webkit.org/r239592 The auto-generated radar will be sufficient. This isn't an important change, and it should have no change in behavior. It's just leading up to some big changes. 357912 2018-12-20 18:15:16 -0800 2018-12-21 11:40:29 -0800 Patch bug-192967-20181220181515.patch text/plain 14557 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk0ODUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTEyLTIwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTmV0d29ya1Byb2Nl c3Mgc2hvdWxkIGluaXRpYWxpemUgaXRzIGRlZmF1bHQgTmV0d29ya1Nlc3Npb24gd2l0aCBwYXJh bWV0ZXJzIGZyb20gdGhlIFVJUHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkyOTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplTmV0d29ya1Byb2Nlc3Mp OgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nl c3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzQ29jb2EpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dl YnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToKKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6cGFyYW1ldGVycyk6CisKIDIwMTgtMTItMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgT3B0aW9uYWw6Omhhc1ZhbHVl KCkgaW5zdGVhZCBvZiBPcHRpb25hbDo6aGFzX3ZhbHVlKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCShyZXZpc2lvbiAyMzk0NjEp CisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjk5LDE1ICsyOTksMTAgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6aW5p dGlhbGl6ZU5ldHdvcmtQcgogICAgIGlmIChwYXJhbWV0ZXJzLnNob3VsZFVzZVRlc3RpbmdOZXR3 b3JrU2Vzc2lvbikKICAgICAgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzd2l0Y2hUb05ld1Rl c3RpbmdTZXNzaW9uKCk7CiAKLSAgICBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycyBz ZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzIHsgfTsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICBz ZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzLmh0dHBQcm94eSA9IFVSTChVUkwoKSwgcGFyYW1ldGVy cy5odHRwUHJveHkpOwotICAgIHNlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaHR0cHNQcm94eSA9 IFVSTChVUkwoKSwgcGFyYW1ldGVycy5odHRwc1Byb3h5KTsKLSNlbmRpZgotICAgIFNlc3Npb25U cmFja2VyOjpzZXRTZXNzaW9uKFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCksIE5l dHdvcmtTZXNzaW9uOjpjcmVhdGUoV1RGTW92ZShzZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzKSkp OworICAgIFNlc3Npb25UcmFja2VyOjpzZXRTZXNzaW9uKFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0 U2Vzc2lvbklEKCksIE5ldHdvcmtTZXNzaW9uOjpjcmVhdGUoV1RGTW92ZShwYXJhbWV0ZXJzLmRl ZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycykpKTsKIAog I2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQotICAgIGFkZEluZGV4ZWREYXRhYmFzZVNlc3Np b24oUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSwgcGFyYW1ldGVycy5pbmRleGVk RGF0YWJhc2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKTsKKyAgICBhZGRJbmRleGVkRGF0YWJhc2VTZXNzaW9uKFBBTDo6U2Vzc2lv bklEOjpkZWZhdWx0U2Vzc2lvbklEKCksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3Rv cmVQYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAj ZW5kaWYKIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKQEAgLTMyMiw3ICszMTcsNyBAQCB2 b2lkIE5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplTmV0d29ya1ByCiAjZW5kaWYKIAogICAgIGF1 dG8qIGRlZmF1bHRTZXNzaW9uID0gU2Vzc2lvblRyYWNrZXI6Om5ldHdvcmtTZXNzaW9uKFBBTDo6 U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkpOwotICAgIGZvciAoY29uc3QgYXV0byYgY29v a2llIDogcGFyYW1ldGVycy5kZWZhdWx0U2Vzc2lvblBlbmRpbmdDb29raWVzKQorICAgIGZvciAo Y29uc3QgYXV0byYgY29va2llIDogcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVy cy5wZW5kaW5nQ29va2llcykKICAgICAgICAgZGVmYXVsdFNlc3Npb24tPm5ldHdvcmtTdG9yYWdl U2Vzc2lvbigpLnNldENvb2tpZShjb29raWUpOwogCiAgICAgZm9yIChhdXRvJiBzdXBwbGVtZW50 IDogbV9zdXBwbGVtZW50cy52YWx1ZXMoKSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuY3BwCShyZXZpc2lvbiAyMzk0NjEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDksMTAgKzQ5LDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6 ZQogI2lmIEVOQUJMRShORVRXT1JLX0NBQ0hFX1NQRUNVTEFUSVZFX1JFVkFMSURBVElPTikKICAg ICBlbmNvZGVyIDw8IHNob3VsZEVuYWJsZU5ldHdvcmtDYWNoZVNwZWN1bGF0aXZlUmV2YWxpZGF0 aW9uOwogI2VuZGlmCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIGVuY29kZXIgPDwgdWlQcm9jZXNz Q29va2llU3RvcmFnZUlkZW50aWZpZXI7Ci0jZW5kaWYKLSAgICBlbmNvZGVyIDw8IGRlZmF1bHRT ZXNzaW9uUGVuZGluZ0Nvb2tpZXM7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBlbmNv ZGVyIDw8IGNvb2tpZVN0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5jb2Rl ciA8PCBjb250YWluZXJDYWNoZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CkBAIC03MSw4ICs2 Nyw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmUKICNpZiBQTEFU Rk9STShJT1NfRkFNSUxZKQogICAgIGVuY29kZXIgPDwgY3REYXRhQ29ubmVjdGlvblNlcnZpY2VU eXBlOwogI2VuZGlmCi0gICAgZW5jb2RlciA8PCBodHRwUHJveHk7Ci0gICAgZW5jb2RlciA8PCBo dHRwc1Byb3h5OworICAgIGVuY29kZXIgPDwgZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnM7CiAg ICAgSVBDOjplbmNvZGUoZW5jb2RlciwgbmV0d29ya0FUU0NvbnRleHQuZ2V0KCkpOwogICAgIGVu Y29kZXIgPDwgc3RvcmFnZUFjY2Vzc0FQSUVuYWJsZWQ7CiAgICAgZW5jb2RlciA8PCBzdXBwcmVz c2VzQ29ubmVjdGlvblRlcm1pbmF0aW9uT25TeXN0ZW1DaGFuZ2U7CkBAIC0xMDAsMTAgKzk1LDYg QEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZQogICAgIGVuY29kZXIg PDwgd2lyZWxlc3NDb250ZXh0SWRlbnRpZmllcjsKICNlbmRpZgogCi0jaWYgRU5BQkxFKElOREVY RURfREFUQUJBU0UpCi0gICAgZW5jb2RlciA8PCBpbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkgPDwg aW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotI2VuZGlmCi0KICNpZiBF TkFCTEUoU0VSVklDRV9XT1JLRVIpCiAgICAgZW5jb2RlciA8PCBzZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uRGlyZWN0b3J5IDw8IHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnlFeHRl bnNpb25IYW5kbGUgPDwgdXJsU2NoZW1lc1NlcnZpY2VXb3JrZXJzQ2FuSGFuZGxlIDw8IHNob3Vs ZERpc2FibGVTZXJ2aWNlV29ya2VyUHJvY2Vzc1Rlcm1pbmF0aW9uRGVsYXk7CiAjZW5kaWYKQEAg LTEzMSwxMiArMTIyLDYgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6 ZAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnNob3VsZEVuYWJsZU5ldHdvcmtDYWNo ZVNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlm Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnVpUHJv Y2Vzc0Nvb2tpZVN0b3JhZ2VJZGVudGlmaWVyKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotI2Vu ZGlmCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZGVmYXVsdFNlc3Npb25QZW5kaW5n Q29va2llcykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4gY29va2llU3RvcmFnZURp cmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICAgICBkZWNvZGVyID4+IGNvb2tpZVN0b3JhZ2VEaXJl Y3RvcnlFeHRlbnNpb25IYW5kbGU7CkBAIC0xODEsMTAgKzE2NiwxMyBAQCBib29sIE5ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1 bHQuY3REYXRhQ29ubmVjdGlvblNlcnZpY2VUeXBlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog I2VuZGlmCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaHR0cFByb3h5KSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lmh0dHBzUHJv eHkpKQorCisgICAgT3B0aW9uYWw8V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnM+IGRlZmF1bHRE YXRhU3RvcmVQYXJhbWV0ZXJzOworICAgIGRlY29kZXIgPj4gZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnM7CisgICAgaWYgKCFkZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycykKICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIHJlc3VsdC5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycyA9IFdURk1v dmUoKmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzKTsKKwogICAgIGlmICghSVBDOjpkZWNvZGUo ZGVjb2RlciwgcmVzdWx0Lm5ldHdvcmtBVFNDb250ZXh0KSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnN0b3JhZ2VBY2Nlc3NBUElFbmFibGVk KSkKQEAgLTIzMSwxNyArMjE5LDYgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVyczo6ZAogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIAotI2lmIEVOQUJMRShJTkRF WEVEX0RBVEFCQVNFKQotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmluZGV4ZWREYXRh YmFzZURpcmVjdG9yeSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICBPcHRpb25h bDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IGluZGV4ZWREYXRhYmFzZURpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZTsKLSAgICBkZWNvZGVyID4+IGluZGV4ZWREYXRhYmFzZURpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZTsKLSAgICBpZiAoIWluZGV4ZWREYXRhYmFzZURpcmVjdG9yeUV4dGVuc2lvbkhh bmRsZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJlc3VsdC5pbmRleGVkRGF0YWJhc2VE aXJlY3RvcnlFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKCppbmRleGVkRGF0YWJhc2VEaXJlY3Rv cnlFeHRlbnNpb25IYW5kbGUpOwotI2VuZGlmCi0KICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIp CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlv bkRpcmVjdG9yeSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDIzOTQ2MSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5 KQpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSAiQ2FjaGVNb2RlbC5oIgogI2luY2x1ZGUg IlNhbmRib3hFeHRlbnNpb24uaCIKKyNpbmNsdWRlICJXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVy cy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQ29va2llLmg+CiAjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJ RC5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KQEAgLTU5LDEwICs2MCw2IEBAIHN0cnVjdCBO ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyAKICNpZiBFTkFCTEUoTkVUV09SS19DQUNI RV9TUEVDVUxBVElWRV9SRVZBTElEQVRJT04pCiAgICAgYm9vbCBzaG91bGRFbmFibGVOZXR3b3Jr Q2FjaGVTcGVjdWxhdGl2ZVJldmFsaWRhdGlvbiB7IGZhbHNlIH07CiAjZW5kaWYKLSNpZiBQTEFU Rk9STShNQUMpCi0gICAgVmVjdG9yPHVpbnQ4X3Q+IHVpUHJvY2Vzc0Nvb2tpZVN0b3JhZ2VJZGVu dGlmaWVyOwotI2VuZGlmCi0gICAgVmVjdG9yPFdlYkNvcmU6OkNvb2tpZT4gZGVmYXVsdFNlc3Np b25QZW5kaW5nQ29va2llczsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZSBjb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwog ICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBjb250YWluZXJDYWNoZXNEaXJlY3RvcnlFeHRl bnNpb25IYW5kbGU7CkBAIC04NCw4ICs4MSw3IEBAIHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycyAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFN0cmluZyBjdERh dGFDb25uZWN0aW9uU2VydmljZVR5cGU7CiAjZW5kaWYKLSAgICBTdHJpbmcgaHR0cFByb3h5Owot ICAgIFN0cmluZyBodHRwc1Byb3h5OworICAgIFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzIGRl ZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzOwogICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IG5ldHdv cmtBVFNDb250ZXh0OwogICAgIGJvb2wgc3RvcmFnZUFjY2Vzc0FQSUVuYWJsZWQ7CiAgICAgYm9v bCBzdXBwcmVzc2VzQ29ubmVjdGlvblRlcm1pbmF0aW9uT25TeXN0ZW1DaGFuZ2U7CkBAIC0xMTQs MTEgKzExMCw2IEBAIHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyAKICAg ICB1bnNpZ25lZCB3aXJlbGVzc0NvbnRleHRJZGVudGlmaWVyIHsgMCB9OwogI2VuZGlmCiAKLSNp ZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKLSAgICBTdHJpbmcgaW5kZXhlZERhdGFiYXNlRGly ZWN0b3J5OwotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBpbmRleGVkRGF0YWJhc2VEaXJl Y3RvcnlFeHRlbnNpb25IYW5kbGU7Ci0jZW5kaWYKLQogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktF UikKICAgICBTdHJpbmcgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeTsKICAgICBT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9y eUV4dGVuc2lvbkhhbmRsZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDIzOTQ2 MSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3ND b2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtOTUsNyArOTUsNyBAQCB2b2lkIE5ldHdvcmtQcm9j ZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOCiAgICAgaW5pdGlhbGl6ZU5ldHdvcmtTZXR0aW5ncygp OwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIHNldFNoYXJlZEhUVFBDb29raWVTdG9yYWdlKHBh cmFtZXRlcnMudWlQcm9jZXNzQ29va2llU3RvcmFnZUlkZW50aWZpZXIpOworICAgIHNldFNoYXJl ZEhUVFBDb29raWVTdG9yYWdlKHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMu dWlQcm9jZXNzQ29va2llU3RvcmFnZUlkZW50aWZpZXIpOwogI2VuZGlmCiAKICAgICBXZWJDb3Jl OjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldFN0b3JhZ2VBY2Nlc3NBUElFbmFibGVkKHBhcmFt ZXRlcnMuc3RvcmFnZUFjY2Vzc0FQSUVuYWJsZWQpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkocmV2aXNpb24gMjM5NDYxKQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzQs MTEgKzQ3NCwxMCBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zCiAg ICAgbV9uZXR3b3JrUHJvY2VzcyA9IHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya1Byb2Nlc3NQcm94 eT4oKnRoaXMpOwogCiAgICAgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcGFyYW1l dGVyczsKLQotICAgIGlmIChtX3dlYnNpdGVEYXRhU3RvcmUpIHsKLSAgICAgICAgcGFyYW1ldGVy cy5kZWZhdWx0U2Vzc2lvblBlbmRpbmdDb29raWVzID0gY29weVRvVmVjdG9yKG1fd2Vic2l0ZURh dGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLnBlbmRpbmdDb29raWVzKCkpOwotICAgICAgICBt X3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5jbGVhclBlbmRpbmdDb29raWVz KCk7Ci0gICAgfQorICAgIGlmICh3aXRoV2Vic2l0ZURhdGFTdG9yZSkKKyAgICAgICAgcGFyYW1l dGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycyA9IHdpdGhXZWJzaXRlRGF0YVN0b3JlLT5w YXJhbWV0ZXJzKCk7CisgICAgZWxzZSBpZiAobV93ZWJzaXRlRGF0YVN0b3JlKQorICAgICAgICBw YXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzID0gbV93ZWJzaXRlRGF0YVN0b3Jl LT53ZWJzaXRlRGF0YVN0b3JlKCkucGFyYW1ldGVycygpOwogCiAgICAgcGFyYW1ldGVycy5jYWNo ZU1vZGVsID0gY2FjaGVNb2RlbCgpOwogICAgIHBhcmFtZXRlcnMuY2FuSGFuZGxlSFRUUFNTZXJ2 ZXJUcnVzdEV2YWx1YXRpb24gPSBtX2NhbkhhbmRsZUhUVFBTU2VydmVyVHJ1c3RFdmFsdWF0aW9u OwpAQCAtNTI5LDExICs1MjgsMTEgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bv b2w6OmVucwogICAgIC8vICoqKioqKioqKgogICAgIC8vIElNUE9SVEFOVDogRG8gbm90IGNoYW5n ZSB0aGUgZGlyZWN0b3J5IHN0cnVjdHVyZSBmb3IgaW5kZXhlZCBkYXRhYmFzZXMgb24gZGlzayB3 aXRob3V0IGZpcnN0IGNvbnN1bHRpbmcgYSByZXZpZXdlciBmcm9tIEFwcGxlICg8cmRhcjovL3By b2JsZW0vMTc0NTQ3MTI+KQogICAgIC8vICoqKioqKioqKgotICAgIHBhcmFtZXRlcnMuaW5kZXhl ZERhdGFiYXNlRGlyZWN0b3J5ID0gbV9jb25maWd1cmF0aW9uLT5pbmRleGVkREJEYXRhYmFzZURp cmVjdG9yeSgpOwotICAgIGlmIChwYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeS5p c0VtcHR5KCkpCi0gICAgICAgIHBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5ID0g QVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3Rv cmUoKS5wYXJhbWV0ZXJzKCkuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5OworICAgIHBhcmFtZXRl cnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5ID0g bV9jb25maWd1cmF0aW9uLT5pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpOworICAgIGlmIChw YXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVj dG9yeS5pc0VtcHR5KCkpCisgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpk ZWZhdWx0RGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKS5wYXJhbWV0ZXJzKCkuaW5kZXhl ZERhdGFiYXNlRGlyZWN0b3J5OwogICAgIAotICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhh bmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVj dG9yeSwgcGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUp OworICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9y eShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURp cmVjdG9yeSwgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0 YWJhc2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoU0VS VklDRV9XT1JLRVIpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHJldmlzaW9uIDIzOTQ2MSkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHdvcmtpbmcgY29w eSkKQEAgLTI1NiwxOSArMjU2LDYgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0 aWFsaXplTgogCiAgICAgTlNVc2VyRGVmYXVsdHMgKmRlZmF1bHRzID0gW05TVXNlckRlZmF1bHRz IHN0YW5kYXJkVXNlckRlZmF1bHRzXTsKIAotICAgIHsKLSAgICAgICAgYm9vbCBpc1NhZmFyaSA9 IGZhbHNlOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgICAgIGlzU2FmYXJpID0gV2Vi Q29yZTo6SU9TQXBwbGljYXRpb246OmlzTW9iaWxlU2FmYXJpKCk7Ci0jZWxpZiBQTEFURk9STShN QUMpCi0gICAgICAgIGlzU2FmYXJpID0gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzU2FmYXJp KCk7Ci0jZW5kaWYKLSAgICAgICAgaWYgKGlzU2FmYXJpKSB7Ci0gICAgICAgICAgICBwYXJhbWV0 ZXJzLmh0dHBQcm94eSA9IFtkZWZhdWx0cyBzdHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0 MkhUVFBQcm94eURlZmF1bHRzS2V5XTsKLSAgICAgICAgICAgIHBhcmFtZXRlcnMuaHR0cHNQcm94 eSA9IFtkZWZhdWx0cyBzdHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBTUHJveHlE ZWZhdWx0c0tleV07Ci0gICAgICAgIH0KLSAgICB9Ci0KICAgICBwYXJhbWV0ZXJzLm5ldHdvcmtB VFNDb250ZXh0ID0gYWRvcHRDRihfQ0ZOZXR3b3JrQ29weUFUU0NvbnRleHQoKSk7CiAKICAgICBw YXJhbWV0ZXJzLnNob3VsZEVuYWJsZU5ldHdvcmtDYWNoZUVmZmljYWN5TG9nZ2luZyA9IFtkZWZh dWx0cyBib29sRm9yS2V5OldlYktpdE5ldHdvcmtDYWNoZUVmZmljYWN5TG9nZ2luZ0VuYWJsZWRE ZWZhdWx0c0tleV07CkBAIC0yODAsOSArMjY3LDkgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxh dGZvcm1Jbml0aWFsaXplTgogICAgIHBhcmFtZXRlcnMuc2hvdWxkU3VwcHJlc3NNZW1vcnlQcmVz c3VyZUhhbmRsZXIgPSBbZGVmYXVsdHMgYm9vbEZvcktleTpXZWJLaXRTdXBwcmVzc01lbW9yeVBy ZXNzdXJlSGFuZGxlckRlZmF1bHRzS2V5XTsKIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBBU1NF UlQocGFyYW1ldGVycy51aVByb2Nlc3NDb29raWVTdG9yYWdlSWRlbnRpZmllci5pc0VtcHR5KCkp OworICAgIEFTU0VSVChwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLnVpUHJv Y2Vzc0Nvb2tpZVN0b3JhZ2VJZGVudGlmaWVyLmlzRW1wdHkoKSk7CiAgICAgQVNTRVJUKGhhc1By b2Nlc3NQcml2aWxlZ2UoUHJvY2Vzc1ByaXZpbGVnZTo6Q2FuQWNjZXNzUmF3Q29va2llcykpOwot ICAgIHBhcmFtZXRlcnMudWlQcm9jZXNzQ29va2llU3RvcmFnZUlkZW50aWZpZXIgPSBpZGVudGlm eWluZ0RhdGFGcm9tQ29va2llU3RvcmFnZShbW05TSFRUUENvb2tpZVN0b3JhZ2Ugc2hhcmVkSFRU UENvb2tpZVN0b3JhZ2VdIF9jb29raWVTdG9yYWdlXSk7CisgICAgcGFyYW1ldGVycy5kZWZhdWx0 RGF0YVN0b3JlUGFyYW1ldGVycy51aVByb2Nlc3NDb29raWVTdG9yYWdlSWRlbnRpZmllciA9IGlk ZW50aWZ5aW5nRGF0YUZyb21Db29raWVTdG9yYWdlKFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFy ZWRIVFRQQ29va2llU3RvcmFnZV0gX2Nvb2tpZVN0b3JhZ2VdKTsKICNlbmRpZgogCiAgICAgcGFy YW1ldGVycy5zdG9yYWdlQWNjZXNzQVBJRW5hYmxlZCA9IHN0b3JhZ2VBY2Nlc3NBUElFbmFibGVk KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJz aXRlRGF0YVN0b3JlQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCShyZXZpc2lvbiAy Mzk0NjEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJz aXRlRGF0YVN0b3JlQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTExMCw3ICsxMTAsNyBAQCBX ZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyBXZWJzaXRlRGF0YVN0CiAgICAgcGFyYW1ldGVycy5u ZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuc291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVy ID0gbV9jb25maWd1cmF0aW9uLT5zb3VyY2VBcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKTsK ICAgICBwYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5zb3VyY2VBcHBsaWNhdGlv blNlY29uZGFyeUlkZW50aWZpZXIgPSBtX2NvbmZpZ3VyYXRpb24tPnNvdXJjZUFwcGxpY2F0aW9u U2Vjb25kYXJ5SWRlbnRpZmllcigpOwogCi0gICAgcGFyYW1ldGVycy5wZW5kaW5nQ29va2llcyA9 IGNvcHlUb1ZlY3RvcihtX3BlbmRpbmdDb29raWVzKTsKKyAgICBwYXJhbWV0ZXJzLnBlbmRpbmdD b29raWVzID0gY29weVRvVmVjdG9yKHN0ZDo6ZXhjaGFuZ2UobV9wZW5kaW5nQ29va2llcywgeyB9 KSk7CiAKICAgICBpZiAoIWNvb2tpZUZpbGUuaXNFbXB0eSgpKQogICAgICAgICBTYW5kYm94RXh0 ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVEaXJlY3RvcnkoV2ViQ29yZTo6RmlsZVN5 c3RlbTo6ZGlyZWN0b3J5TmFtZShjb29raWVGaWxlKSwgcGFyYW1ldGVycy5jb29raWVTdG9yYWdl UGF0aEV4dGVuc2lvbkhhbmRsZSk7Cg== 357961 2018-12-21 11:40:29 -0800 2019-01-03 08:49:33 -0800 Patch bug-192967-20181221114029.patch text/plain 8564 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk1MDkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTEyLTIxICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTmV0d29ya1Byb2Nl c3Mgc2hvdWxkIGluaXRpYWxpemUgaXRzIGRlZmF1bHQgTmV0d29ya1Nlc3Npb24gd2l0aCBwYXJh bWV0ZXJzIGZyb20gdGhlIFVJUHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkyOTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSSBtb3ZlZCAzIG9mIHRoZSBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyB0byB1c2UgY29ycmVzcG9uZGluZyB2YWx1ZXMgb2YgYSBXZWJzaXRlRGF0YVN0 b3JlUGFyYW1ldGVycy4KKyAgICAgICAgTW9yZSB3aWxsIGJlIG1vdmVkIGluIHRoZSBuZWFyIGZ1 dHVyZSwgbGlrZSBpbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9j ZXNzOjppbml0aWFsaXplTmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJv Y2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKwogMjAxOC0x Mi0yMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJlbW92ZSB1bnVzZWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCShy ZXZpc2lvbiAyMzk1MDcpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk4LDEyICsyOTgsOCBAQCB2b2lkIE5ldHdv cmtQcm9jZXNzOjppbml0aWFsaXplTmV0d29ya1ByCiAgICAgaWYgKHBhcmFtZXRlcnMuc2hvdWxk VXNlVGVzdGluZ05ldHdvcmtTZXNzaW9uKQogICAgICAgICBOZXR3b3JrU3RvcmFnZVNlc3Npb246 OnN3aXRjaFRvTmV3VGVzdGluZ1Nlc3Npb24oKTsKIAotICAgIE5ldHdvcmtTZXNzaW9uQ3JlYXRp b25QYXJhbWV0ZXJzIHNlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMgeyB9OwotI2lmIFBMQVRGT1JN KENPQ09BKQotICAgIHNlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaHR0cFByb3h5ID0gVVJMKFVS TCgpLCBwYXJhbWV0ZXJzLmh0dHBQcm94eSk7Ci0gICAgc2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVy cy5odHRwc1Byb3h5ID0gVVJMKFVSTCgpLCBwYXJhbWV0ZXJzLmh0dHBzUHJveHkpOwotI2VuZGlm Ci0gICAgU2Vzc2lvblRyYWNrZXI6OnNldFNlc3Npb24oUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRT ZXNzaW9uSUQoKSwgTmV0d29ya1Nlc3Npb246OmNyZWF0ZShXVEZNb3ZlKHNlc3Npb25DcmVhdGlv blBhcmFtZXRlcnMpKSk7CisgICAgYXV0byBzZXNzaW9uSUQgPSBwYXJhbWV0ZXJzLmRlZmF1bHRE YXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5zZXNzaW9uSUQ7Cisg ICAgU2Vzc2lvblRyYWNrZXI6OnNldFNlc3Npb24oc2Vzc2lvbklELCBOZXR3b3JrU2Vzc2lvbjo6 Y3JlYXRlKFdURk1vdmUocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3 b3JrU2Vzc2lvblBhcmFtZXRlcnMpKSk7CiAKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkK ICAgICBhZGRJbmRleGVkRGF0YWJhc2VTZXNzaW9uKFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vz c2lvbklEKCksIHBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5LCBwYXJhbWV0ZXJz LmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CkBAIC0zMjEsNyArMzE3 LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZU5ldHdvcmtQcgogI2VuZGlmCiAK ICAgICBhdXRvKiBkZWZhdWx0U2Vzc2lvbiA9IFNlc3Npb25UcmFja2VyOjpuZXR3b3JrU2Vzc2lv bihQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKLSAgICBmb3IgKGNvbnN0IGF1 dG8mIGNvb2tpZSA6IHBhcmFtZXRlcnMuZGVmYXVsdFNlc3Npb25QZW5kaW5nQ29va2llcykKKyAg ICBmb3IgKGNvbnN0IGF1dG8mIGNvb2tpZSA6IHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBh cmFtZXRlcnMucGVuZGluZ0Nvb2tpZXMpCiAgICAgICAgIGRlZmF1bHRTZXNzaW9uLT5uZXR3b3Jr U3RvcmFnZVNlc3Npb24oKS5zZXRDb29raWUoY29va2llKTsKIAogICAgIGZvciAoYXV0byYgc3Vw cGxlbWVudCA6IG1fc3VwcGxlbWVudHMudmFsdWVzKCkpCkluZGV4OiBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjM5NTA3KQorKysgU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTUyLDcgKzUyLDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVyczo6ZQogI2lmIFBMQVRGT1JNKE1BQykKICAgICBlbmNvZGVyIDw8IHVpUHJvY2Vzc0Nvb2tp ZVN0b3JhZ2VJZGVudGlmaWVyOwogI2VuZGlmCi0gICAgZW5jb2RlciA8PCBkZWZhdWx0U2Vzc2lv blBlbmRpbmdDb29raWVzOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgZW5jb2RlciA8 PCBjb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogICAgIGVuY29kZXIgPDwg Y29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwpAQCAtNzAsMTIgKzY5LDEx IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmUKICNpZiBQTEFURk9S TShJT1NfRkFNSUxZKQogICAgIGVuY29kZXIgPDwgY3REYXRhQ29ubmVjdGlvblNlcnZpY2VUeXBl OwogI2VuZGlmCi0gICAgZW5jb2RlciA8PCBodHRwUHJveHk7Ci0gICAgZW5jb2RlciA8PCBodHRw c1Byb3h5OwogICAgIElQQzo6ZW5jb2RlKGVuY29kZXIsIG5ldHdvcmtBVFNDb250ZXh0LmdldCgp KTsKICAgICBlbmNvZGVyIDw8IHN0b3JhZ2VBY2Nlc3NBUElFbmFibGVkOwogICAgIGVuY29kZXIg PDwgc3VwcHJlc3Nlc0Nvbm5lY3Rpb25UZXJtaW5hdGlvbk9uU3lzdGVtQ2hhbmdlOwogI2VuZGlm CisgICAgZW5jb2RlciA8PCBkZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVyczsKICNpZiBVU0UoU09V UCkKICAgICBlbmNvZGVyIDw8IGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aDsKICAgICBlbmNv ZGVyIDw8IGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZTsKQEAgLTEzNCw4ICsxMzIsNiBAQCBi b29sIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkCiAgICAgaWYgKCFkZWNvZGVy LmRlY29kZShyZXN1bHQudWlQcm9jZXNzQ29va2llU3RvcmFnZUlkZW50aWZpZXIpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5k ZWZhdWx0U2Vzc2lvblBlbmRpbmdDb29raWVzKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFu ZGxlPiBjb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogICAgIGRlY29kZXIg Pj4gY29va2llU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKQEAgLTE3OCwxMCArMTc0 LDYgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZAogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUocmVzdWx0LmN0RGF0YUNvbm5lY3Rpb25TZXJ2aWNlVHlwZSkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0 Lmh0dHBQcm94eSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5odHRwc1Byb3h5KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICgh SVBDOjpkZWNvZGUoZGVjb2RlciwgcmVzdWx0Lm5ldHdvcmtBVFNDb250ZXh0KSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnN0b3JhZ2VBY2Nl c3NBUElFbmFibGVkKSkKQEAgLTE5MCw2ICsxODIsMTIgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVyczo6ZAogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIAorICAg IE9wdGlvbmFsPFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzPiBkZWZhdWx0RGF0YVN0b3JlUGFy YW1ldGVyczsKKyAgICBkZWNvZGVyID4+IGRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzOworICAg IGlmICghZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMpCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICByZXN1bHQuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMgPSBXVEZNb3ZlKCpkZWZhdWx0 RGF0YVN0b3JlUGFyYW1ldGVycyk7CisKICNpZiBVU0UoU09VUCkKICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHJlc3VsdC5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVBhdGgpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAy Mzk1MDcpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKIAogI2lu Y2x1ZGUgIkNhY2hlTW9kZWwuaCIKICNpbmNsdWRlICJTYW5kYm94RXh0ZW5zaW9uLmgiCisjaW5j bHVkZSAiV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0Nv b2tpZS5oPgogI2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9y Lmg+CkBAIC02Miw3ICs2Myw2IEBAIHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycyAKICNpZiBQTEFURk9STShNQUMpCiAgICAgVmVjdG9yPHVpbnQ4X3Q+IHVpUHJvY2Vzc0Nv b2tpZVN0b3JhZ2VJZGVudGlmaWVyOwogI2VuZGlmCi0gICAgVmVjdG9yPFdlYkNvcmU6OkNvb2tp ZT4gZGVmYXVsdFNlc3Npb25QZW5kaW5nQ29va2llczsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBjb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlOwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBjb250YWluZXJDYWNo ZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CkBAIC04MiwxMyArODIsMTMgQEAgc3RydWN0IE5l dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgU3RyaW5nIGN0RGF0YUNvbm5lY3Rpb25TZXJ2aWNlVHlwZTsKICNlbmRpZgotICAgIFN0 cmluZyBodHRwUHJveHk7Ci0gICAgU3RyaW5nIGh0dHBzUHJveHk7CiAgICAgUmV0YWluUHRyPENG RGF0YVJlZj4gbmV0d29ya0FUU0NvbnRleHQ7CiAgICAgYm9vbCBzdG9yYWdlQWNjZXNzQVBJRW5h YmxlZDsKICAgICBib29sIHN1cHByZXNzZXNDb25uZWN0aW9uVGVybWluYXRpb25PblN5c3RlbUNo YW5nZTsKICNlbmRpZgogCisgICAgV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMgZGVmYXVsdERh dGFTdG9yZVBhcmFtZXRlcnM7CisgICAgCiAjaWYgVVNFKFNPVVApCiAgICAgU3RyaW5nIGNvb2tp ZVBlcnNpc3RlbnRTdG9yYWdlUGF0aDsKICAgICB1aW50MzJfdCBjb29raWVQZXJzaXN0ZW50U3Rv cmFnZVR5cGUgeyAwIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwCShyZXZpc2lvbiAyMzk1MDcpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3Niw3ICs0NzYsNyBAQCBOZXR3 b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zCiAgICAgTmV0d29ya1Byb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMgcGFyYW1ldGVyczsKIAogICAgIGlmIChtX3dlYnNpdGVEYXRhU3Rv cmUpIHsKLSAgICAgICAgcGFyYW1ldGVycy5kZWZhdWx0U2Vzc2lvblBlbmRpbmdDb29raWVzID0g Y29weVRvVmVjdG9yKG1fd2Vic2l0ZURhdGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLnBlbmRp bmdDb29raWVzKCkpOworICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0 ZXJzLnBlbmRpbmdDb29raWVzID0gY29weVRvVmVjdG9yKG1fd2Vic2l0ZURhdGFTdG9yZS0+d2Vi c2l0ZURhdGFTdG9yZSgpLnBlbmRpbmdDb29raWVzKCkpOwogICAgICAgICBtX3dlYnNpdGVEYXRh U3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5jbGVhclBlbmRpbmdDb29raWVzKCk7CiAgICAgfQog CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29h Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nl c3NQb29sQ29jb2EubW0JKHJldmlzaW9uIDIzOTUwNykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTI2NCw4 ICsyNjQsOCBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVOCiAgICAg ICAgIGlzU2FmYXJpID0gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzU2FmYXJpKCk7CiAjZW5k aWYKICAgICAgICAgaWYgKGlzU2FmYXJpKSB7Ci0gICAgICAgICAgICBwYXJhbWV0ZXJzLmh0dHBQ cm94eSA9IFtkZWZhdWx0cyBzdHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBQcm94 eURlZmF1bHRzS2V5XTsKLSAgICAgICAgICAgIHBhcmFtZXRlcnMuaHR0cHNQcm94eSA9IFtkZWZh dWx0cyBzdHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBTUHJveHlEZWZhdWx0c0tl eV07CisgICAgICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5l dHdvcmtTZXNzaW9uUGFyYW1ldGVycy5odHRwUHJveHkgPSBVUkwoVVJMKCksIFtkZWZhdWx0cyBz dHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBQcm94eURlZmF1bHRzS2V5XSk7Cisg ICAgICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5odHRwc1Byb3h5ID0gVVJMKFVSTCgpLCBbZGVmYXVsdHMgc3RyaW5n Rm9yS2V5OihOU1N0cmluZyAqKVdlYktpdDJIVFRQU1Byb3h5RGVmYXVsdHNLZXldKTsKICAgICAg ICAgfQogICAgIH0KIAo=