190763 2018-10-19 15:06:52 -0700 WebDataListSuggestionsDropdown should use a WeakPtr 2018-10-19 16:15:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1471000 0 achristensen 2018-10-19 15:06:52 -0700 WebDataListSuggestionsDropdown should use a WeakPtr 1471001 1 352826 achristensen 2018-10-19 15:07:52 -0700 Created attachment 352826 Patch 1471002 2 achristensen 2018-10-19 15:07:55 -0700 <rdar://problem/45417449> 1471005 3 352827 achristensen 2018-10-19 15:19:06 -0700 Created attachment 352827 Patch 1471012 4 352830 achristensen 2018-10-19 15:59:47 -0700 Created attachment 352830 Patch 1471017 5 achristensen 2018-10-19 16:15:47 -0700 https://trac.webkit.org/changeset/237307/webkit 352826 2018-10-19 15:07:52 -0700 2018-10-19 15:19:04 -0700 Patch bug-190763-20181019150752.patch text/plain 10783 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzczMDUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE4LTEwLTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViRGF0YUxpc3RT dWdnZXN0aW9uc0Ryb3Bkb3duIHNob3VsZCB1c2UgYSBXZWFrUHRyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA3NjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ1NDE3NDQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vdGhpbmcgc3VzcGljaW91cyBoZXJlLiBJdCdzIGp1c3QgZ29vZCBwcmFjdGlj ZSB0byBub3Qga2VlcCByYXcgcG9pbnRlcnMgdGhhdCBhcmVuJ3QgcmVzZXQgd2hlbiB0aGUgb2Jq ZWN0IHRoZXkgcG9pbnQgdG8gYXJlIGRlc3Ryb3llZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJE YXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bik6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6Y2xv c2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24u aDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpDbGll bnQ6On5DbGllbnQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bklPUy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ry b3Bkb3duSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJv cGRvd25JT1M6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bklPUzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TKToKKyAgICAg ICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjpjbG9zZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUzo6ZGlkU2Vs ZWN0T3B0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bk1hYy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dl c3Rpb25zRHJvcGRvd25NYWM6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0 U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFj KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjOjpk aWRTZWxlY3RPcHRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25z RHJvcGRvd25NYWM6OnNlbGVjdE9wdGlvbik6CisKIDIwMTgtMTAtMTkgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gW0RhdGFsaXN0XSBDYW4n dCBwaWNrIGRhdGFsaXN0IHN1Z2dlc3Rpb25zIGluIGEgc3RvY2sgV0tXZWJWaWV3CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bi5jcHAJKHJldmlzaW9uIDIzNzI5NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMwLDggKzMwLDggQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVdlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bjo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKENsaWVudCYg Y2xpZW50KQotICAgIDogbV9jbGllbnQoJmNsaWVudCkKK1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNE cm9wZG93bjo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKFdlYlBhZ2VQcm94eSYgcGFn ZSkKKyAgICA6IG1fcGFnZShtYWtlV2Vha1B0cihwYWdlKSkKIHsKIH0KIApAQCAtNDEsOCArNDEs OCBAQCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246On5XZWJEYXRhCiAKIHZvaWQgV2Vi RGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpjbG9zZSgpCiB7Ci0gICAgbV9jbGllbnQtPmRp ZENsb3NlU3VnZ2VzdGlvbnMoKTsKLSAgICBtX2NsaWVudCA9IG51bGxwdHI7CisgICAgaWYgKGF1 dG8gcGFnZSA9IHN0ZDo6ZXhjaGFuZ2UobV9wYWdlLCBudWxscHRyKSkKKyAgICAgICAgcGFnZS0+ ZGlkQ2xvc2VTdWdnZXN0aW9ucygpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bi5oCShyZXZpc2lvbiAyMzcyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24uaAkod29ya2luZyBjb3B5KQpAQCAt MzAsMjAgKzMwLDE0IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9EYXRhTGlzdFN1Z2dlc3Rpb25QaWNr ZXIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIu aD4KKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xh c3MgV2ViUGFnZVByb3h5OworCiBjbGFzcyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24g OiBwdWJsaWMgUmVmQ291bnRlZDxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24+IHsKIHB1 YmxpYzoKLSAgICBjbGFzcyBDbGllbnQgewotICAgIHByb3RlY3RlZDoKLSAgICAgICAgdmlydHVh bCB+Q2xpZW50KCkgeyB9Ci0KLSAgICBwdWJsaWM6Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRT ZWxlY3RPcHRpb24oY29uc3QgU3RyaW5nJikgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlk Q2xvc2VTdWdnZXN0aW9ucygpID0gMDsKLSAgICB9OwotCiAgICAgdmlydHVhbCB+V2ViRGF0YUxp c3RTdWdnZXN0aW9uc0Ryb3Bkb3duKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2hvdyhXZWJDb3Jl OjpEYXRhTGlzdFN1Z2dlc3Rpb25JbmZvcm1hdGlvbiYmKSA9IDA7CkBAIC01MSw5ICs0NSw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2UoKTsKIAogcHJvdGVjdGVkOgotICAgIGV4 cGxpY2l0IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bihDbGllbnQmKTsKKyAgICBleHBs aWNpdCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24oV2ViUGFnZVByb3h5Jik7CiAKLSAg ICBDbGllbnQqIG1fY2xpZW50OworICAgIFdlYWtQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMzcyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzMzLDkgKzMzMyw2IEBAIGNsYXNz IFdlYlBhZ2VQcm94eSA6IHB1YmxpYyBBUEk6Ok9iamVjdEkKICNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKICAgICAsIHB1YmxpYyBXZWJDb2xvclBpY2tlcjo6Q2xpZW50CiAjZW5kaWYKLSNp ZiBFTkFCTEUoREFUQUxJU1RfRUxFTUVOVCkKLSAgICAsIHB1YmxpYyBXZWJEYXRhTGlzdFN1Z2dl c3Rpb25zRHJvcGRvd246OkNsaWVudAotI2VuZGlmCiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlC QUNLX1RBUkdFVCkgJiYgIVBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgLCBwdWJsaWMgV2ViQ29y ZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlckNsaWVudAogI2VuZGlmCkBAIC0xMzY0LDYgKzEzNjEs MTEgQEAgcHVibGljOgogICAgIFZlY3RvcjxTdHJpbmc+IG1lZGlhTUlNRVR5cGVzKCk7CiAjZW5k aWYKIAorI2lmIEVOQUJMRShEQVRBTElTVF9FTEVNRU5UKQorICAgIHZvaWQgZGlkU2VsZWN0T3B0 aW9uKGNvbnN0IFN0cmluZyYpOworICAgIHZvaWQgZGlkQ2xvc2VTdWdnZXN0aW9ucygpOworI2Vu ZGlmCisKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNz UHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsK ICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwpAQCAtMTU1MSw4ICsxNTUzLDYgQEAgcHJp dmF0ZToKICAgICB2b2lkIHNob3dEYXRhTGlzdFN1Z2dlc3Rpb25zKFdlYkNvcmU6OkRhdGFMaXN0 U3VnZ2VzdGlvbkluZm9ybWF0aW9uJiYpOwogICAgIHZvaWQgaGFuZGxlS2V5ZG93bkluRGF0YUxp c3QoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBlbmREYXRhTGlzdFN1Z2dlc3Rpb25zKCk7Ci0g ICAgdm9pZCBkaWRTZWxlY3RPcHRpb24oY29uc3QgU3RyaW5nJikgZmluYWw7Ci0gICAgdm9pZCBk aWRDbG9zZVN1Z2dlc3Rpb25zKCkgZmluYWw7CiAjZW5kaWYKIAogICAgIHZvaWQgY2xvc2VPdmVy bGF5ZWRWaWV3cygpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFM aXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MuaAkocmV2aXNp b24gMjM3Mjk0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bklPUy5oCSh3b3JraW5nIGNvcHkpCkBAIC00MiwxMiArNDIsMTIgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bklPUyA6IHB1YmxpYyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24gewogcHVibGljOgot ICAgIHN0YXRpYyBSZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TPiBjcmVhdGUo V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpDbGllbnQmLCBXS0NvbnRlbnRWaWV3ICop OworICAgIHN0YXRpYyBSZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TPiBjcmVh dGUoV2ViUGFnZVByb3h5JiwgV0tDb250ZW50VmlldyAqKTsKIAogICAgIHZvaWQgZGlkU2VsZWN0 T3B0aW9uKGNvbnN0IFN0cmluZyYpOwogCiBwcml2YXRlOgotICAgIFdlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bklPUyhXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYs IFdLQ29udGVudFZpZXcgKik7CisgICAgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9T KFdlYlBhZ2VQcm94eSYsIFdLQ29udGVudFZpZXcgKik7CiAKICAgICB2b2lkIHNob3coV2ViQ29y ZTo6RGF0YUxpc3RTdWdnZXN0aW9uSW5mb3JtYXRpb24mJikgZmluYWw7CiAgICAgdm9pZCBoYW5k bGVLZXlkb3duV2l0aElkZW50aWZpZXIoY29uc3QgU3RyaW5nJikgZmluYWw7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9T Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlz dFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0JKHJldmlzaW9uIDIzNzI5NCkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0J KHdvcmtpbmcgY29weSkKQEAgLTgxLDEzICs4MSwxMyBAQCAtICh2b2lkKXJlbG9hZERhdGE7CiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCi1SZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3du SU9TPiBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OmNyZWF0ZShXZWJEYXRhTGlz dFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYgY2xpZW50LCBXS0NvbnRlbnRWaWV3ICp2aWV3 KQorUmVmPFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUz4gV2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duSU9TOjpjcmVhdGUoV2ViUGFnZVByb3h5JiBwYWdlLCBXS0NvbnRlbnRW aWV3ICp2aWV3KQogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bklPUyhjbGllbnQsIHZpZXcpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5l dyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MocGFnZSwgdmlldykpOwogfQogCi1X ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNE cm9wZG93bklPUyhXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYgY2xpZW50 LCBXS0NvbnRlbnRWaWV3ICp2aWV3KQotICAgIDogV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bk b3duKGNsaWVudCkKK1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUzo6V2ViRGF0YUxp c3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TKFdlYlBhZ2VQcm94eSYgcGFnZSwgV0tDb250ZW50Vmll dyAqdmlldykKKyAgICA6IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bihwYWdlKQogICAg ICwgbV9jb250ZW50Vmlldyh2aWV3KQogewogfQpAQCAtMTE3LDE1ICsxMTcsMTUgQEAgdm9pZCBX ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OgogewogICAgIFttX3N1Z2dlc3Rpb25z Q29udHJvbCBpbnZhbGlkYXRlXTsKICAgICBtX3N1Z2dlc3Rpb25zQ29udHJvbCA9IG5pbDsKLSAg ICBtX2NsaWVudC0+ZGlkQ2xvc2VTdWdnZXN0aW9ucygpOworICAgIG1fcGFnZS0+ZGlkQ2xvc2VT dWdnZXN0aW9ucygpOwogfQogCiB2b2lkIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklP Uzo6ZGlkU2VsZWN0T3B0aW9uKGNvbnN0IFN0cmluZyYgc2VsZWN0ZWRPcHRpb24pCiB7Ci0gICAg aWYgKCFtX2NsaWVudCkKKyAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg bV9jbGllbnQtPmRpZFNlbGVjdE9wdGlvbihzZWxlY3RlZE9wdGlvbik7CisgICAgbV9wYWdlLT5k aWRTZWxlY3RPcHRpb24oc2VsZWN0ZWRPcHRpb24pOwogICAgIGNsb3NlKCk7CiB9CiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRv d25NYWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViRGF0 YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjLmgJKHJldmlzaW9uIDIzNzI5NCkKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMu aAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTMgKzM2LDEzIEBAIG5hbWVzcGFjZSBXZWJLaXQgewog CiBjbGFzcyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMgZmluYWwgOiBwdWJsaWMg V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVm PFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYz4gY3JlYXRlKFdlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bjo6Q2xpZW50JiwgTlNWaWV3ICopOworICAgIHN0YXRpYyBSZWY8V2Vi RGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjPiBjcmVhdGUoV2ViUGFnZVByb3h5JiwgTlNW aWV3ICopOwogICAgIH5XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMoKTsKIAogICAg IHZvaWQgZGlkU2VsZWN0T3B0aW9uKGNvbnN0IFN0cmluZyYpOwogCiBwcml2YXRlOgotICAgIFdl YkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYyhXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJv cGRvd246OkNsaWVudCYsIE5TVmlldyAqKTsKKyAgICBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJv cGRvd25NYWMoV2ViUGFnZVByb3h5JiwgTlNWaWV3ICopOwogCiAgICAgdm9pZCBzaG93KFdlYkNv cmU6OkRhdGFMaXN0U3VnZ2VzdGlvbkluZm9ybWF0aW9uJiYpIGZpbmFsOwogICAgIHZvaWQgaGFu ZGxlS2V5ZG93bldpdGhJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYpIGZpbmFsOwpJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViRGF0YUxp c3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjLm1tCShyZXZpc2lvbiAyMzcyOTQpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjLm1t CSh3b3JraW5nIGNvcHkpCkBAIC04NCwxNSArODQsMTUgQEAgLSAoU3RyaW5nKWN1cnJlbnRTZWxl Y3RlZFN0cmluZzsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVJlZjxXZWJEYXRhTGlzdFN1Z2dl c3Rpb25zRHJvcGRvd25NYWM+IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6Y3Jl YXRlKFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6Q2xpZW50JiBjbGllbnQsIE5TVmll dyAqdmlldykKK1JlZjxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM+IFdlYkRhdGFM aXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6Y3JlYXRlKFdlYlBhZ2VQcm94eSYgcGFnZSwgTlNW aWV3ICp2aWV3KQogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bk1hYyhjbGllbnQsIHZpZXcpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5l dyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMocGFnZSwgdmlldykpOwogfQogCiBX ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6On5XZWJEYXRhTGlzdFN1Z2dlc3Rpb25z RHJvcGRvd25NYWMoKSB7IH0KIAotV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjOjpX ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMoV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ry b3Bkb3duOjpDbGllbnQmIGNsaWVudCwgTlNWaWV3ICp2aWV3KQotICAgIDogV2ViRGF0YUxpc3RT dWdnZXN0aW9uc0Ryb3Bkb3duKGNsaWVudCkKK1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bk1hYzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjKFdlYlBhZ2VQcm94eSYgcGFn ZSwgTlNWaWV3ICp2aWV3KQorICAgIDogV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKHBh Z2UpCiAgICAgLCBtX3ZpZXcodmlldykKIHsKIH0KQEAgLTExMCwyMSArMTEwLDIxIEBAIHZvaWQg V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjOjoKIAogdm9pZCBXZWJEYXRhTGlzdFN1 Z2dlc3Rpb25zRHJvcGRvd25NYWM6OmRpZFNlbGVjdE9wdGlvbihjb25zdCBTdHJpbmcmIHNlbGVj dGVkT3B0aW9uKQogewotICAgIGlmICghbV9jbGllbnQpCisgICAgaWYgKCFtX3BhZ2UpCiAgICAg ICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50LT5kaWRTZWxlY3RPcHRpb24oc2VsZWN0ZWRPcHRp b24pOworICAgIG1fcGFnZS0+ZGlkU2VsZWN0T3B0aW9uKHNlbGVjdGVkT3B0aW9uKTsKICAgICBj bG9zZSgpOwogfQogCiB2b2lkIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6c2Vs ZWN0T3B0aW9uKCkKIHsKLSAgICBpZiAoIW1fY2xpZW50KQorICAgIGlmICghbV9wYWdlKQogICAg ICAgICByZXR1cm47CiAKICAgICBTdHJpbmcgc2VsZWN0ZWRPcHRpb24gPSBbbV9kcm9wZG93blVJ IGN1cnJlbnRTZWxlY3RlZFN0cmluZ107CiAgICAgaWYgKCFzZWxlY3RlZE9wdGlvbi5pc051bGwo KSkKLSAgICAgICAgbV9jbGllbnQtPmRpZFNlbGVjdE9wdGlvbihzZWxlY3RlZE9wdGlvbik7Cisg ICAgICAgIG1fcGFnZS0+ZGlkU2VsZWN0T3B0aW9uKHNlbGVjdGVkT3B0aW9uKTsKIAogICAgIGNs b3NlKCk7CiB9Cg== 352827 2018-10-19 15:19:06 -0700 2018-10-19 15:59:45 -0700 Patch bug-190763-20181019151905.patch text/plain 11006 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzczMDUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE4LTEwLTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViRGF0YUxpc3RT dWdnZXN0aW9uc0Ryb3Bkb3duIHNob3VsZCB1c2UgYSBXZWFrUHRyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA3NjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ1NDE3NDQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vdGhpbmcgc3VzcGljaW91cyBoZXJlLiBJdCdzIGp1c3QgZ29vZCBwcmFjdGlj ZSB0byBub3Qga2VlcCByYXcgcG9pbnRlcnMgdGhhdCBhcmVuJ3QgcmVzZXQgd2hlbiB0aGUgb2Jq ZWN0IHRoZXkgcG9pbnQgdG8gYXJlIGRlc3Ryb3llZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJE YXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bik6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6Y2xv c2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24u aDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpDbGll bnQ6On5DbGllbnQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bklPUy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ry b3Bkb3duSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJv cGRvd25JT1M6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bklPUzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TKToKKyAgICAg ICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjpjbG9zZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUzo6ZGlkU2Vs ZWN0T3B0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bk1hYy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dl c3Rpb25zRHJvcGRvd25NYWM6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0 U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFj KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjOjpk aWRTZWxlY3RPcHRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25z RHJvcGRvd25NYWM6OnNlbGVjdE9wdGlvbik6CisKIDIwMTgtMTAtMTkgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gW0RhdGFsaXN0XSBDYW4n dCBwaWNrIGRhdGFsaXN0IHN1Z2dlc3Rpb25zIGluIGEgc3RvY2sgV0tXZWJWaWV3CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bi5jcHAJKHJldmlzaW9uIDIzNzI5NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMwLDggKzMwLDggQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVdlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bjo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKENsaWVudCYg Y2xpZW50KQotICAgIDogbV9jbGllbnQoJmNsaWVudCkKK1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNE cm9wZG93bjo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKFdlYlBhZ2VQcm94eSYgcGFn ZSkKKyAgICA6IG1fcGFnZShtYWtlV2Vha1B0cihwYWdlKSkKIHsKIH0KIApAQCAtNDEsOCArNDEs OCBAQCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246On5XZWJEYXRhCiAKIHZvaWQgV2Vi RGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpjbG9zZSgpCiB7Ci0gICAgbV9jbGllbnQtPmRp ZENsb3NlU3VnZ2VzdGlvbnMoKTsKLSAgICBtX2NsaWVudCA9IG51bGxwdHI7CisgICAgaWYgKGF1 dG8gcGFnZSA9IHN0ZDo6ZXhjaGFuZ2UobV9wYWdlLCBudWxscHRyKSkKKyAgICAgICAgcGFnZS0+ ZGlkQ2xvc2VTdWdnZXN0aW9ucygpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bi5oCShyZXZpc2lvbiAyMzcyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24uaAkod29ya2luZyBjb3B5KQpAQCAt MzAsMjAgKzMwLDE0IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9EYXRhTGlzdFN1Z2dlc3Rpb25QaWNr ZXIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIu aD4KKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xh c3MgV2ViUGFnZVByb3h5OworCiBjbGFzcyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24g OiBwdWJsaWMgUmVmQ291bnRlZDxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24+IHsKIHB1 YmxpYzoKLSAgICBjbGFzcyBDbGllbnQgewotICAgIHByb3RlY3RlZDoKLSAgICAgICAgdmlydHVh bCB+Q2xpZW50KCkgeyB9Ci0KLSAgICBwdWJsaWM6Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRT ZWxlY3RPcHRpb24oY29uc3QgU3RyaW5nJikgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlk Q2xvc2VTdWdnZXN0aW9ucygpID0gMDsKLSAgICB9OwotCiAgICAgdmlydHVhbCB+V2ViRGF0YUxp c3RTdWdnZXN0aW9uc0Ryb3Bkb3duKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2hvdyhXZWJDb3Jl OjpEYXRhTGlzdFN1Z2dlc3Rpb25JbmZvcm1hdGlvbiYmKSA9IDA7CkBAIC01MSw5ICs0NSw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2UoKTsKIAogcHJvdGVjdGVkOgotICAgIGV4 cGxpY2l0IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bihDbGllbnQmKTsKKyAgICBleHBs aWNpdCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24oV2ViUGFnZVByb3h5Jik7CiAKLSAg ICBDbGllbnQqIG1fY2xpZW50OworICAgIFdlYWtQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMzcyOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzMzLDkgKzMzMyw2IEBAIGNsYXNz IFdlYlBhZ2VQcm94eSA6IHB1YmxpYyBBUEk6Ok9iamVjdEkKICNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKICAgICAsIHB1YmxpYyBXZWJDb2xvclBpY2tlcjo6Q2xpZW50CiAjZW5kaWYKLSNp ZiBFTkFCTEUoREFUQUxJU1RfRUxFTUVOVCkKLSAgICAsIHB1YmxpYyBXZWJEYXRhTGlzdFN1Z2dl c3Rpb25zRHJvcGRvd246OkNsaWVudAotI2VuZGlmCiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlC QUNLX1RBUkdFVCkgJiYgIVBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgLCBwdWJsaWMgV2ViQ29y ZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlckNsaWVudAogI2VuZGlmCkBAIC0xMzY0LDYgKzEzNjEs MTEgQEAgcHVibGljOgogICAgIFZlY3RvcjxTdHJpbmc+IG1lZGlhTUlNRVR5cGVzKCk7CiAjZW5k aWYKIAorI2lmIEVOQUJMRShEQVRBTElTVF9FTEVNRU5UKQorICAgIHZvaWQgZGlkU2VsZWN0T3B0 aW9uKGNvbnN0IFN0cmluZyYpOworICAgIHZvaWQgZGlkQ2xvc2VTdWdnZXN0aW9ucygpOworI2Vu ZGlmCisKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNz UHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsK ICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwpAQCAtMTU1MSw4ICsxNTUzLDYgQEAgcHJp dmF0ZToKICAgICB2b2lkIHNob3dEYXRhTGlzdFN1Z2dlc3Rpb25zKFdlYkNvcmU6OkRhdGFMaXN0 U3VnZ2VzdGlvbkluZm9ybWF0aW9uJiYpOwogICAgIHZvaWQgaGFuZGxlS2V5ZG93bkluRGF0YUxp c3QoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBlbmREYXRhTGlzdFN1Z2dlc3Rpb25zKCk7Ci0g ICAgdm9pZCBkaWRTZWxlY3RPcHRpb24oY29uc3QgU3RyaW5nJikgZmluYWw7Ci0gICAgdm9pZCBk aWRDbG9zZVN1Z2dlc3Rpb25zKCkgZmluYWw7CiAjZW5kaWYKIAogICAgIHZvaWQgY2xvc2VPdmVy bGF5ZWRWaWV3cygpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFM aXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MuaAkocmV2aXNp b24gMjM3Mjk0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bklPUy5oCSh3b3JraW5nIGNvcHkpCkBAIC00MiwxMiArNDIsMTIgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bklPUyA6IHB1YmxpYyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24gewogcHVibGljOgot ICAgIHN0YXRpYyBSZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TPiBjcmVhdGUo V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpDbGllbnQmLCBXS0NvbnRlbnRWaWV3ICop OworICAgIHN0YXRpYyBSZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TPiBjcmVh dGUoV2ViUGFnZVByb3h5JiwgV0tDb250ZW50VmlldyAqKTsKIAogICAgIHZvaWQgZGlkU2VsZWN0 T3B0aW9uKGNvbnN0IFN0cmluZyYpOwogCiBwcml2YXRlOgotICAgIFdlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bklPUyhXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYs IFdLQ29udGVudFZpZXcgKik7CisgICAgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9T KFdlYlBhZ2VQcm94eSYsIFdLQ29udGVudFZpZXcgKik7CiAKICAgICB2b2lkIHNob3coV2ViQ29y ZTo6RGF0YUxpc3RTdWdnZXN0aW9uSW5mb3JtYXRpb24mJikgZmluYWw7CiAgICAgdm9pZCBoYW5k bGVLZXlkb3duV2l0aElkZW50aWZpZXIoY29uc3QgU3RyaW5nJikgZmluYWw7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9T Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlz dFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0JKHJldmlzaW9uIDIzNzI5NCkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0J KHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAKICNpbXBvcnQgIldLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5oIgogI2ltcG9ydCAiV0tGb3JtUGVyaXBoZXJhbC5oIgogI2ltcG9ydCAiV0tG b3JtUG9wb3Zlci5oIgorI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCiAjaW1wb3J0ICJfV0tGb3Jt SW5wdXRTZXNzaW9uLmgiCiAKIHN0YXRpYyBjb25zdCBDR0Zsb2F0IG1heFZpc2libGVTdWdnZXN0 aW9ucyA9IDU7CkBAIC04MSwxMyArODIsMTMgQEAgLSAodm9pZClyZWxvYWREYXRhOwogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotUmVmPFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUz4g V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjpjcmVhdGUoV2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duOjpDbGllbnQmIGNsaWVudCwgV0tDb250ZW50VmlldyAqdmlldykKK1Jl ZjxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M+IFdlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bklPUzo6Y3JlYXRlKFdlYlBhZ2VQcm94eSYgcGFnZSwgV0tDb250ZW50VmlldyAq dmlldykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25z RHJvcGRvd25JT1MoY2xpZW50LCB2aWV3KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2Vi RGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TKHBhZ2UsIHZpZXcpKTsKIH0KIAotV2ViRGF0 YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRv d25JT1MoV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpDbGllbnQmIGNsaWVudCwgV0tD b250ZW50VmlldyAqdmlldykKLSAgICA6IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bihj bGllbnQpCitXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OldlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bklPUyhXZWJQYWdlUHJveHkmIHBhZ2UsIFdLQ29udGVudFZpZXcgKnZp ZXcpCisgICAgOiBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24ocGFnZSkKICAgICAsIG1f Y29udGVudFZpZXcodmlldykKIHsKIH0KQEAgLTExNywxNSArMTE4LDE1IEBAIHZvaWQgV2ViRGF0 YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjoKIHsKICAgICBbbV9zdWdnZXN0aW9uc0NvbnRy b2wgaW52YWxpZGF0ZV07CiAgICAgbV9zdWdnZXN0aW9uc0NvbnRyb2wgPSBuaWw7Ci0gICAgbV9j bGllbnQtPmRpZENsb3NlU3VnZ2VzdGlvbnMoKTsKKyAgICBtX3BhZ2UtPmRpZENsb3NlU3VnZ2Vz dGlvbnMoKTsKIH0KIAogdm9pZCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OmRp ZFNlbGVjdE9wdGlvbihjb25zdCBTdHJpbmcmIHNlbGVjdGVkT3B0aW9uKQogewotICAgIGlmICgh bV9jbGllbnQpCisgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fY2xp ZW50LT5kaWRTZWxlY3RPcHRpb24oc2VsZWN0ZWRPcHRpb24pOworICAgIG1fcGFnZS0+ZGlkU2Vs ZWN0T3B0aW9uKHNlbGVjdGVkT3B0aW9uKTsKICAgICBjbG9zZSgpOwogfQogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFj LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0 U3VnZ2VzdGlvbnNEcm9wZG93bk1hYy5oCShyZXZpc2lvbiAyMzcyOTQpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjLmgJKHdv cmtpbmcgY29weSkKQEAgLTM2LDEzICszNiwxMyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xh c3MgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjIGZpbmFsIDogcHVibGljIFdlYkRh dGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93biB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxXZWJE YXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM+IGNyZWF0ZShXZWJEYXRhTGlzdFN1Z2dlc3Rp b25zRHJvcGRvd246OkNsaWVudCYsIE5TVmlldyAqKTsKKyAgICBzdGF0aWMgUmVmPFdlYkRhdGFM aXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYz4gY3JlYXRlKFdlYlBhZ2VQcm94eSYsIE5TVmlldyAq KTsKICAgICB+V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjKCk7CiAKICAgICB2b2lk IGRpZFNlbGVjdE9wdGlvbihjb25zdCBTdHJpbmcmKTsKIAogcHJpdmF0ZToKLSAgICBXZWJEYXRh TGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMoV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3du OjpDbGllbnQmLCBOU1ZpZXcgKik7CisgICAgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3du TWFjKFdlYlBhZ2VQcm94eSYsIE5TVmlldyAqKTsKIAogICAgIHZvaWQgc2hvdyhXZWJDb3JlOjpE YXRhTGlzdFN1Z2dlc3Rpb25JbmZvcm1hdGlvbiYmKSBmaW5hbDsKICAgICB2b2lkIGhhbmRsZUtl eWRvd25XaXRoSWRlbnRpZmllcihjb25zdCBTdHJpbmcmKSBmaW5hbDsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bk1hYy5tbQkocmV2aXNpb24gMjM3Mjk0KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtODQsMTUgKzg0LDE1IEBAIC0gKFN0cmluZyljdXJyZW50U2VsZWN0ZWRT dHJpbmc7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1SZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duTWFjPiBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6OmNyZWF0ZShX ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYgY2xpZW50LCBOU1ZpZXcgKnZp ZXcpCitSZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjPiBXZWJEYXRhTGlzdFN1 Z2dlc3Rpb25zRHJvcGRvd25NYWM6OmNyZWF0ZShXZWJQYWdlUHJveHkmIHBhZ2UsIE5TVmlldyAq dmlldykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25z RHJvcGRvd25NYWMoY2xpZW50LCB2aWV3KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2Vi RGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjKHBhZ2UsIHZpZXcpKTsKIH0KIAogV2ViRGF0 YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjOjp+V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bk b3duTWFjKCkgeyB9CiAKLVdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6V2ViRGF0 YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjKFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bjo6Q2xpZW50JiBjbGllbnQsIE5TVmlldyAqdmlldykKLSAgICA6IFdlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bihjbGllbnQpCitXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6 OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYyhXZWJQYWdlUHJveHkmIHBhZ2UsIE5T VmlldyAqdmlldykKKyAgICA6IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bihwYWdlKQog ICAgICwgbV92aWV3KHZpZXcpCiB7CiB9CkBAIC0xMTAsMjEgKzExMCwyMSBAQCB2b2lkIFdlYkRh dGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6CiAKIHZvaWQgV2ViRGF0YUxpc3RTdWdnZXN0 aW9uc0Ryb3Bkb3duTWFjOjpkaWRTZWxlY3RPcHRpb24oY29uc3QgU3RyaW5nJiBzZWxlY3RlZE9w dGlvbikKIHsKLSAgICBpZiAoIW1fY2xpZW50KQorICAgIGlmICghbV9wYWdlKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBtX2NsaWVudC0+ZGlkU2VsZWN0T3B0aW9uKHNlbGVjdGVkT3B0aW9uKTsK KyAgICBtX3BhZ2UtPmRpZFNlbGVjdE9wdGlvbihzZWxlY3RlZE9wdGlvbik7CiAgICAgY2xvc2Uo KTsKIH0KIAogdm9pZCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6OnNlbGVjdE9w dGlvbigpCiB7Ci0gICAgaWYgKCFtX2NsaWVudCkKKyAgICBpZiAoIW1fcGFnZSkKICAgICAgICAg cmV0dXJuOwogCiAgICAgU3RyaW5nIHNlbGVjdGVkT3B0aW9uID0gW21fZHJvcGRvd25VSSBjdXJy ZW50U2VsZWN0ZWRTdHJpbmddOwogICAgIGlmICghc2VsZWN0ZWRPcHRpb24uaXNOdWxsKCkpCi0g ICAgICAgIG1fY2xpZW50LT5kaWRTZWxlY3RPcHRpb24oc2VsZWN0ZWRPcHRpb24pOworICAgICAg ICBtX3BhZ2UtPmRpZFNlbGVjdE9wdGlvbihzZWxlY3RlZE9wdGlvbik7CiAKICAgICBjbG9zZSgp OwogfQo= 352830 2018-10-19 15:59:47 -0700 2018-10-19 16:02:12 -0700 Patch bug-190763-20181019155946.patch text/plain 11026 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzczMDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE4LTEwLTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViRGF0YUxpc3RT dWdnZXN0aW9uc0Ryb3Bkb3duIHNob3VsZCB1c2UgYSBXZWFrUHRyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA3NjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ1NDE3NDQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAg ICAgICAgTm90aGluZyBzdXNwaWNpb3VzIGhlcmUuIEl0J3MganVzdCBnb29kIHByYWN0aWNlIHRv IG5vdCBrZWVwIHJhdyBwb2ludGVycyB0aGF0IGFyZW4ndCByZXNldCB3aGVuIHRoZSBvYmplY3Qg dGhleSBwb2ludCB0byBhcmUgZGVzdHJveWVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkRh dGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFM aXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKToK KyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpjbG9zZSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudDo6 fkNsaWVudCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9T Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRv d25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bklPUzo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ry b3Bkb3duSU9TOjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MpOgorICAgICAgICAo V2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OmNsb3NlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjpkaWRTZWxlY3RP cHRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ry b3Bkb3duTWFjLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJEYXRhTGlzdFN1Z2dlc3Rp b25zRHJvcGRvd25NYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bk1hYzo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duTWFjOjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMpOgor ICAgICAgICAoV2ViS2l0OjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6OmRpZFNl bGVjdE9wdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9w ZG93bk1hYzo6c2VsZWN0T3B0aW9uKToKKwogMjAxOC0xMC0xOSAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBbRGF0YWxpc3RdIENhbid0IHBp Y2sgZGF0YWxpc3Qgc3VnZ2VzdGlvbnMgaW4gYSBzdG9jayBXS1dlYlZpZXcKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duLmNwcAkocmV2aXNpb24gMjM3MzA2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzAsOCArMzAsOCBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViRGF0YUxpc3RTdWdnZXN0 aW9uc0Ryb3Bkb3duOjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24oQ2xpZW50JiBjbGll bnQpCi0gICAgOiBtX2NsaWVudCgmY2xpZW50KQorV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bk b3duOjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24oV2ViUGFnZVByb3h5JiBwYWdlKQor ICAgIDogbV9wYWdlKG1ha2VXZWFrUHRyKHBhZ2UpKQogewogfQogCkBAIC00MSw4ICs0MSw4IEBA IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6fldlYkRhdGEKIAogdm9pZCBXZWJEYXRh TGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OmNsb3NlKCkKIHsKLSAgICBtX2NsaWVudC0+ZGlkQ2xv c2VTdWdnZXN0aW9ucygpOwotICAgIG1fY2xpZW50ID0gbnVsbHB0cjsKKyAgICBpZiAoYXV0byBw YWdlID0gc3RkOjpleGNoYW5nZShtX3BhZ2UsIG51bGxwdHIpKQorICAgICAgICBwYWdlLT5kaWRD bG9zZVN1Z2dlc3Rpb25zKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duLmgJKHJldmlzaW9uIDIzNzMwNikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCwy MCArMzAsMTQgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0RhdGFMaXN0U3VnZ2VzdGlvblBpY2tlci5o PgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgor I2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBX ZWJQYWdlUHJveHk7CisKIGNsYXNzIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93biA6IHB1 YmxpYyBSZWZDb3VudGVkPFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bj4gewogcHVibGlj OgotICAgIGNsYXNzIENsaWVudCB7Ci0gICAgcHJvdGVjdGVkOgotICAgICAgICB2aXJ0dWFsIH5D bGllbnQoKSB7IH0KLQotICAgIHB1YmxpYzoKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZFNlbGVj dE9wdGlvbihjb25zdCBTdHJpbmcmKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDbG9z ZVN1Z2dlc3Rpb25zKCkgPSAwOwotICAgIH07Ci0KICAgICB2aXJ0dWFsIH5XZWJEYXRhTGlzdFN1 Z2dlc3Rpb25zRHJvcGRvd24oKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzaG93KFdlYkNvcmU6OkRh dGFMaXN0U3VnZ2VzdGlvbkluZm9ybWF0aW9uJiYpID0gMDsKQEAgLTUxLDkgKzQ1LDkgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBjbG9zZSgpOwogCiBwcm90ZWN0ZWQ6Ci0gICAgZXhwbGlj aXQgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKENsaWVudCYpOworICAgIGV4cGxpY2l0 IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bihXZWJQYWdlUHJveHkmKTsKIAotICAgIENs aWVudCogbV9jbGllbnQ7CisgICAgV2Vha1B0cjxXZWJQYWdlUHJveHk+IG1fcGFnZTsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHJldmlzaW9uIDIzNzMwNikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMzMsOSArMzMzLDYgQEAgY2xhc3MgV2Vi UGFnZVByb3h5IDogcHVibGljIEFQSTo6T2JqZWN0SQogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NP TE9SKQogICAgICwgcHVibGljIFdlYkNvbG9yUGlja2VyOjpDbGllbnQKICNlbmRpZgotI2lmIEVO QUJMRShEQVRBTElTVF9FTEVNRU5UKQotICAgICwgcHVibGljIFdlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bjo6Q2xpZW50Ci0jZW5kaWYKICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tf VEFSR0VUKSAmJiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAsIHB1YmxpYyBXZWJDb3JlOjpX ZWJNZWRpYVNlc3Npb25NYW5hZ2VyQ2xpZW50CiAjZW5kaWYKQEAgLTEzNjQsNiArMTM2MSwxMSBA QCBwdWJsaWM6CiAgICAgVmVjdG9yPFN0cmluZz4gbWVkaWFNSU1FVHlwZXMoKTsKICNlbmRpZgog CisjaWYgRU5BQkxFKERBVEFMSVNUX0VMRU1FTlQpCisgICAgdm9pZCBkaWRTZWxlY3RPcHRpb24o Y29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBkaWRDbG9zZVN1Z2dlc3Rpb25zKCk7CisjZW5kaWYK KwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94 eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAg IHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBAIC0xNTUxLDggKzE1NTMsNiBAQCBwcml2YXRl OgogICAgIHZvaWQgc2hvd0RhdGFMaXN0U3VnZ2VzdGlvbnMoV2ViQ29yZTo6RGF0YUxpc3RTdWdn ZXN0aW9uSW5mb3JtYXRpb24mJik7CiAgICAgdm9pZCBoYW5kbGVLZXlkb3duSW5EYXRhTGlzdChj b25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGVuZERhdGFMaXN0U3VnZ2VzdGlvbnMoKTsKLSAgICB2 b2lkIGRpZFNlbGVjdE9wdGlvbihjb25zdCBTdHJpbmcmKSBmaW5hbDsKLSAgICB2b2lkIGRpZENs b3NlU3VnZ2VzdGlvbnMoKSBmaW5hbDsKICNlbmRpZgogCiAgICAgdm9pZCBjbG9zZU92ZXJsYXll ZFZpZXdzKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RT dWdnZXN0aW9uc0Ryb3Bkb3duSU9TLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5oCShyZXZpc2lvbiAy MzczMDYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0 aW9uc0Ryb3Bkb3duSU9TLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDEyICs0MiwxMiBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9T IDogcHVibGljIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93biB7CiBwdWJsaWM6Ci0gICAg c3RhdGljIFJlZjxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M+IGNyZWF0ZShXZWJE YXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYsIFdLQ29udGVudFZpZXcgKik7Cisg ICAgc3RhdGljIFJlZjxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M+IGNyZWF0ZShX ZWJQYWdlUHJveHkmLCBXS0NvbnRlbnRWaWV3ICopOwogCiAgICAgdm9pZCBkaWRTZWxlY3RPcHRp b24oY29uc3QgU3RyaW5nJik7CiAKIHByaXZhdGU6Ci0gICAgV2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duSU9TKFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6Q2xpZW50JiwgV0tD b250ZW50VmlldyAqKTsKKyAgICBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MoV2Vi UGFnZVByb3h5JiwgV0tDb250ZW50VmlldyAqKTsKIAogICAgIHZvaWQgc2hvdyhXZWJDb3JlOjpE YXRhTGlzdFN1Z2dlc3Rpb25JbmZvcm1hdGlvbiYmKSBmaW5hbDsKICAgICB2b2lkIGhhbmRsZUtl eWRvd25XaXRoSWRlbnRpZmllcihjb25zdCBTdHJpbmcmKSBmaW5hbDsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bklPUy5tbQkocmV2aXNpb24gMjM3MzA2KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5tbQkod29y a2luZyBjb3B5KQpAQCAtMzIsNiArMzIsNyBAQAogI2ltcG9ydCAiV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmgiCiAjaW1wb3J0ICJXS0Zvcm1QZXJpcGhlcmFsLmgiCiAjaW1wb3J0ICJXS0Zvcm1Q b3BvdmVyLmgiCisjaW1wb3J0ICJXZWJQYWdlUHJveHkuaCIKIAogc3RhdGljIGNvbnN0IENHRmxv YXQgbWF4VmlzaWJsZVN1Z2dlc3Rpb25zID0gNTsKIHN0YXRpYyBjb25zdCBDR0Zsb2F0IHN1Z2dl c3Rpb25zUG9wb3ZlckNlbGxIZWlnaHQgPSA0NDsKQEAgLTgwLDEzICs4MSwxMyBAQCAtICh2b2lk KXJlbG9hZERhdGE7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1SZWY8V2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duSU9TPiBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OmNy ZWF0ZShXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYgY2xpZW50LCBXS0Nv bnRlbnRWaWV3ICp2aWV3KQorUmVmPFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUz4g V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TOjpjcmVhdGUoV2ViUGFnZVByb3h5JiBw YWdlLCBXS0NvbnRlbnRWaWV3ICp2aWV3KQogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdl YkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUyhjbGllbnQsIHZpZXcpKTsKKyAgICByZXR1 cm4gYWRvcHRSZWYoKm5ldyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MocGFnZSwg dmlldykpOwogfQogCi1XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OldlYkRhdGFM aXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUyhXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd246 OkNsaWVudCYgY2xpZW50LCBXS0NvbnRlbnRWaWV3ICp2aWV3KQotICAgIDogV2ViRGF0YUxpc3RT dWdnZXN0aW9uc0Ryb3Bkb3duKGNsaWVudCkKK1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 bklPUzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TKFdlYlBhZ2VQcm94eSYgcGFn ZSwgV0tDb250ZW50VmlldyAqdmlldykKKyAgICA6IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9w ZG93bihwYWdlKQogICAgICwgbV9jb250ZW50Vmlldyh2aWV3KQogewogfQpAQCAtMTE2LDE1ICsx MTcsMTUgQEAgdm9pZCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OgogewogICAg IFttX3N1Z2dlc3Rpb25zQ29udHJvbCBpbnZhbGlkYXRlXTsKICAgICBtX3N1Z2dlc3Rpb25zQ29u dHJvbCA9IG5pbDsKLSAgICBtX2NsaWVudC0+ZGlkQ2xvc2VTdWdnZXN0aW9ucygpOworICAgIG1f cGFnZS0+ZGlkQ2xvc2VTdWdnZXN0aW9ucygpOwogfQogCiB2b2lkIFdlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bklPUzo6ZGlkU2VsZWN0T3B0aW9uKGNvbnN0IFN0cmluZyYgc2VsZWN0ZWRP cHRpb24pCiB7Ci0gICAgaWYgKCFtX2NsaWVudCkKKyAgICBpZiAoIW1fcGFnZSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgbV9jbGllbnQtPmRpZFNlbGVjdE9wdGlvbihzZWxlY3RlZE9wdGlvbik7 CisgICAgbV9wYWdlLT5kaWRTZWxlY3RPcHRpb24oc2VsZWN0ZWRPcHRpb24pOwogICAgIGNsb3Nl KCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJEYXRhTGlzdFN1 Z2dlc3Rpb25zRHJvcGRvd25NYWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjLmgJKHJldmlzaW9uIDIz NzMwNikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJEYXRhTGlzdFN1Z2dlc3Rp b25zRHJvcGRvd25NYWMuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTMgKzM2LDEzIEBAIG5hbWVz cGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMg ZmluYWwgOiBwdWJsaWMgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duIHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUmVmPFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYz4gY3JlYXRl KFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6Q2xpZW50JiwgTlNWaWV3ICopOworICAg IHN0YXRpYyBSZWY8V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjPiBjcmVhdGUoV2Vi UGFnZVByb3h5JiwgTlNWaWV3ICopOwogICAgIH5XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRv d25NYWMoKTsKIAogICAgIHZvaWQgZGlkU2VsZWN0T3B0aW9uKGNvbnN0IFN0cmluZyYpOwogCiBw cml2YXRlOgotICAgIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYyhXZWJEYXRhTGlz dFN1Z2dlc3Rpb25zRHJvcGRvd246OkNsaWVudCYsIE5TVmlldyAqKTsKKyAgICBXZWJEYXRhTGlz dFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMoV2ViUGFnZVByb3h5JiwgTlNWaWV3ICopOwogCiAgICAg dm9pZCBzaG93KFdlYkNvcmU6OkRhdGFMaXN0U3VnZ2VzdGlvbkluZm9ybWF0aW9uJiYpIGZpbmFs OwogICAgIHZvaWQgaGFuZGxlS2V5ZG93bldpdGhJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYpIGZp bmFsOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bk1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjLm1tCShyZXZpc2lvbiAyMzcz MDYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC04NCwxNSArODQsMTUgQEAgLSAoU3Ry aW5nKWN1cnJlbnRTZWxlY3RlZFN0cmluZzsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVJlZjxX ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM+IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNE cm9wZG93bk1hYzo6Y3JlYXRlKFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bjo6Q2xpZW50 JiBjbGllbnQsIE5TVmlldyAqdmlldykKK1JlZjxXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRv d25NYWM+IFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYzo6Y3JlYXRlKFdlYlBhZ2VQ cm94eSYgcGFnZSwgTlNWaWV3ICp2aWV3KQogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdl YkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bk1hYyhjbGllbnQsIHZpZXcpKTsKKyAgICByZXR1 cm4gYWRvcHRSZWYoKm5ldyBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMocGFnZSwg dmlldykpOwogfQogCiBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6On5XZWJEYXRh TGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMoKSB7IH0KIAotV2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duTWFjOjpXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWMoV2ViRGF0YUxp c3RTdWdnZXN0aW9uc0Ryb3Bkb3duOjpDbGllbnQmIGNsaWVudCwgTlNWaWV3ICp2aWV3KQotICAg IDogV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duKGNsaWVudCkKK1dlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bk1hYzo6V2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjKFdl YlBhZ2VQcm94eSYgcGFnZSwgTlNWaWV3ICp2aWV3KQorICAgIDogV2ViRGF0YUxpc3RTdWdnZXN0 aW9uc0Ryb3Bkb3duKHBhZ2UpCiAgICAgLCBtX3ZpZXcodmlldykKIHsKIH0KQEAgLTExMCwyMSAr MTEwLDIxIEBAIHZvaWQgV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duTWFjOjoKIAogdm9p ZCBXZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25NYWM6OmRpZFNlbGVjdE9wdGlvbihjb25z dCBTdHJpbmcmIHNlbGVjdGVkT3B0aW9uKQogewotICAgIGlmICghbV9jbGllbnQpCisgICAgaWYg KCFtX3BhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50LT5kaWRTZWxlY3RPcHRp b24oc2VsZWN0ZWRPcHRpb24pOworICAgIG1fcGFnZS0+ZGlkU2VsZWN0T3B0aW9uKHNlbGVjdGVk T3B0aW9uKTsKICAgICBjbG9zZSgpOwogfQogCiB2b2lkIFdlYkRhdGFMaXN0U3VnZ2VzdGlvbnNE cm9wZG93bk1hYzo6c2VsZWN0T3B0aW9uKCkKIHsKLSAgICBpZiAoIW1fY2xpZW50KQorICAgIGlm ICghbV9wYWdlKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJpbmcgc2VsZWN0ZWRPcHRpb24g PSBbbV9kcm9wZG93blVJIGN1cnJlbnRTZWxlY3RlZFN0cmluZ107CiAgICAgaWYgKCFzZWxlY3Rl ZE9wdGlvbi5pc051bGwoKSkKLSAgICAgICAgbV9jbGllbnQtPmRpZFNlbGVjdE9wdGlvbihzZWxl Y3RlZE9wdGlvbik7CisgICAgICAgIG1fcGFnZS0+ZGlkU2VsZWN0T3B0aW9uKHNlbGVjdGVkT3B0 aW9uKTsKIAogICAgIGNsb3NlKCk7CiB9Cg==