193067 2019-01-01 11:54:53 -0800 Don't spin up a CalcParser if the current token is not a function token 2019-01-02 13:11:30 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1491107 0 simon.fraser 2019-01-01 11:54:53 -0800 Don't spin up a CalcParser if the current token is not a function token 1491108 1 358173 simon.fraser 2019-01-01 11:56:04 -0800 Created attachment 358173 Patch 1491109 2 358174 simon.fraser 2019-01-01 11:57:29 -0800 Created attachment 358174 Patch 1491204 3 358174 commit-queue 2019-01-02 11:59:02 -0800 Comment on attachment 358174 Patch Rejecting attachment 358174 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 358174, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=358174&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=193067&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 358174 from bug 193067. Fetching: https://bugs.webkit.org/attachment.cgi?id=358174 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Zalan Bujtas']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp Hunk #1 succeeded at 138 (offset -1 lines). Hunk #2 succeeded at 151 (offset -1 lines). Hunk #3 succeeded at 169 (offset -1 lines). Hunk #4 succeeded at 201 (offset -1 lines). Hunk #5 succeeded at 213 (offset -1 lines). Hunk #6 succeeded at 235 (offset -1 lines). Hunk #7 succeeded at 301 (offset -1 lines). Hunk #8 succeeded at 320 (offset -1 lines). Hunk #9 succeeded at 353 (offset -1 lines). Hunk #10 succeeded at 379 (offset -1 lines). Hunk #11 FAILED at 408. Hunk #12 succeeded at 432 (offset 5 lines). Hunk #13 succeeded at 446 (offset 5 lines). 1 out of 13 hunks FAILED -- saving rejects to file Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Zalan Bujtas']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/10606740 1491228 4 simon.fraser 2019-01-02 13:10:03 -0800 https://trac.webkit.org/r239575 1491229 5 webkit-bug-importer 2019-01-02 13:11:30 -0800 <rdar://problem/47009161> 358173 2019-01-01 11:56:04 -0800 2019-01-01 11:57:27 -0800 Patch bug-193067-20190101115603.patch text/plain 9424 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjQyOTFjY2VmYzRmODI3 MWU0YmE4MjliN2UzMDQwYjEyYmNjZjBiYS4uYTEzYzc0NDA1YTY4ZWRhMDA0NzM5NGUzOTQ1YTAz Y2RhOGE1YzMyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTAxLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IHNwaW4g dXAgYSBDYWxjUGFyc2VyIGlmIHRoZSBjdXJyZW50IHRva2VuIGlzIG5vdCBhIGZ1bmN0aW9uIHRv a2VuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMw NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWYXJp b3VzIGZ1bmN0aW9ucyBpbiBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMgZmFsbCBiYWNrIHRvIHRy eWluZyB0byBwYXJzZQorICAgICAgICBhIGNhbGMgZXhwcmVzc2lvbiBpZiB0aGUgbm9ybWFsIHBh cnNpbmcgZmFpbHMuIERvbid0IGRvIHRoaXMgdW5sZXNzIHRoZQorICAgICAgICBjdXJyZW50IHRv a2VuIGlzIGEgZnVuY3Rpb24gdG9rZW4sIHdoaWNoIHNob3VsZCBiZSBzbGlnaHRseSBtb3JlIGVm ZmljaWVudC4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJz LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6Y29uc3Vt ZUludGVnZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpj b25zdW1lUG9zaXRpdmVJbnRlZ2VyUmF3KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5 UGFyc2VySGVscGVyczo6Y29uc3VtZU51bWJlclJhdyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ cm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVOdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lRm9udFdlaWdodE51bWJlcik6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVMZW5ndGgpOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lUGVyY2Vu dCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVM ZW5ndGhPclBlcmNlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxw ZXJzOjpjb25zdW1lQW5nbGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJI ZWxwZXJzOjpjb25zdW1lQW5nbGVPclBlcmNlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJv cGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lVGltZSk6CisKIDIwMTgtMTItMjEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJUQ1J0cFNlbmRlci5zZXRQYXJh bWV0ZXJzKCkgZG9lcyBzZXQgYWN0aXZlIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwCmluZGV4IDAzYjEx YWUzM2FjNTUxMmVmYTEyZWNmNmEzMWVmZWM0OWY3Y2IzZDAuLjZmOGVkZThhZjQxOTZhYTMzNThl YzEwOWI4YjI2YWI4ZDg0NGEzODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHAKQEAgLTEzOSwxNCArMTM5LDE3IEBA IFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUludGVnZXIoQ1NTUGFyc2VyVG9rZW5S YW5nZSYgcmFuZ2UsIGRvdWJsZSBtaW5pCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICAgICAgcmV0dXJuIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlVmFsdWUocmFuZ2Uu Y29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKS5udW1lcmljVmFsdWUoKSwgQ1NTUHJpbWl0aXZl VmFsdWU6OlVuaXRUeXBlOjpDU1NfTlVNQkVSKTsKICAgICB9Ci0gICAgQ2FsY1BhcnNlciBjYWxj UGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpOdW1iZXIpOwotICAgIGlmIChjb25z dCBDU1NDYWxjVmFsdWUqIGNhbGN1bGF0aW9uID0gY2FsY1BhcnNlci52YWx1ZSgpKSB7Ci0gICAg ICAgIGlmIChjYWxjdWxhdGlvbi0+Y2F0ZWdvcnkoKSAhPSBDYWxjdWxhdGlvbkNhdGVnb3J5OjpO dW1iZXIgfHwgIWNhbGN1bGF0aW9uLT5pc0ludCgpKQotICAgICAgICAgICAgcmV0dXJuIG51bGxw dHI7Ci0gICAgICAgIGRvdWJsZSB2YWx1ZSA9IGNhbGN1bGF0aW9uLT5kb3VibGVWYWx1ZSgpOwot ICAgICAgICBpZiAodmFsdWUgPCBtaW5pbXVtVmFsdWUpCi0gICAgICAgICAgICByZXR1cm4gbnVs bHB0cjsKLSAgICAgICAgcmV0dXJuIGNhbGNQYXJzZXIuY29uc3VtZU51bWJlcigpOworCisgICAg aWYgKHRva2VuLnR5cGUoKSA9PSBGdW5jdGlvblRva2VuKSB7CisgICAgICAgIENhbGNQYXJzZXIg Y2FsY1BhcnNlcihyYW5nZSwgQ2FsY3VsYXRpb25DYXRlZ29yeTo6TnVtYmVyKTsKKyAgICAgICAg aWYgKGNvbnN0IENTU0NhbGNWYWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZhbHVlKCkp IHsKKyAgICAgICAgICAgIGlmIChjYWxjdWxhdGlvbi0+Y2F0ZWdvcnkoKSAhPSBDYWxjdWxhdGlv bkNhdGVnb3J5OjpOdW1iZXIgfHwgIWNhbGN1bGF0aW9uLT5pc0ludCgpKQorICAgICAgICAgICAg ICAgIHJldHVybiBudWxscHRyOworICAgICAgICAgICAgZG91YmxlIHZhbHVlID0gY2FsY3VsYXRp b24tPmRvdWJsZVZhbHVlKCk7CisgICAgICAgICAgICBpZiAodmFsdWUgPCBtaW5pbXVtVmFsdWUp CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICByZXR1cm4gY2Fs Y1BhcnNlci5jb25zdW1lTnVtYmVyKCk7CisgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIG51 bGxwdHI7CiB9CkBAIC0xNjUsMTYgKzE2OCwyNSBAQCBib29sIGNvbnN1bWVQb3NpdGl2ZUludGVn ZXJSYXcoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIGludCYgcmVzdWx0KQogICAgICAgICBy ZXN1bHQgPSByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLm51bWVyaWNWYWx1ZSgp OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CisKKyAgICBpZiAodG9rZW4udHlwZSgpICE9 IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIENhbGNQYXJzZXIg Y2FsY1BhcnNlcihyYW5nZSwgQ2FsY3VsYXRpb25DYXRlZ29yeTo6TnVtYmVyKTsKICAgICByZXR1 cm4gY2FsY1BhcnNlci5jb25zdW1lUG9zaXRpdmVJbnRlZ2VyUmF3KHJlc3VsdCk7CiB9CiAgICAg CiBib29sIGNvbnN1bWVOdW1iZXJSYXcoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIGRvdWJs ZSYgcmVzdWx0KQogewotICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpID09IE51bWJlclRva2Vu KSB7CisgICAgY29uc3QgQ1NTUGFyc2VyVG9rZW4mIHRva2VuID0gcmFuZ2UucGVlaygpOworICAg IGlmICh0b2tlbi50eXBlKCkgPT0gTnVtYmVyVG9rZW4pIHsKICAgICAgICAgcmVzdWx0ID0gcmFu Z2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKS5udW1lcmljVmFsdWUoKTsKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQorCisgICAgaWYgKHRva2VuLnR5cGUoKSAhPSBGdW5jdGlvblRv a2VuKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBDYWxjUGFyc2VyIGNhbGNQYXJzZXIo cmFuZ2UsIENhbGN1bGF0aW9uQ2F0ZWdvcnk6Ok51bWJlciwgVmFsdWVSYW5nZUFsbCk7CiAgICAg cmV0dXJuIGNhbGNQYXJzZXIuY29uc3VtZU51bWJlclJhdyhyZXN1bHQpOwogfQpAQCAtMTg4LDYg KzIwMCwxMCBAQCBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVOdW1iZXIoQ1NTUGFy c2VyVG9rZW5SYW5nZSYgcmFuZ2UsIFZhbHVlUmFuZ2UgdgogICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAgICAgICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZVZh bHVlKHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCkubnVtZXJpY1ZhbHVlKCksIHRv a2VuLnVuaXRUeXBlKCkpOwogICAgIH0KKworICAgIGlmICh0b2tlbi50eXBlKCkgIT0gRnVuY3Rp b25Ub2tlbikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKICAgICBDYWxjUGFyc2VyIGNhbGNQ YXJzZXIocmFuZ2UsIENhbGN1bGF0aW9uQ2F0ZWdvcnk6Ok51bWJlciwgVmFsdWVSYW5nZUFsbCk7 CiAgICAgaWYgKGNvbnN0IENTU0NhbGNWYWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZh bHVlKCkpIHsKICAgICAgICAgLy8gRklYTUU6IENhbGNzIHNob3VsZCBub3QgYmUgc3ViamVjdCB0 byBwYXJzZSB0aW1lIHJhbmdlIGNoZWNrcy4KQEAgLTE5Niw2ICsyMTIsNyBAQCBSZWZQdHI8Q1NT UHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVOdW1iZXIoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2Us IFZhbHVlUmFuZ2UgdgogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIHJldHVy biBjYWxjUGFyc2VyLmNvbnN1bWVOdW1iZXIoKTsKICAgICB9CisKICAgICByZXR1cm4gbnVsbHB0 cjsKIH0KIApAQCAtMjE3LDYgKzIzNCw5IEBAIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29u c3VtZUZvbnRXZWlnaHROdW1iZXIoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UpCiAgICAgKQog ICAgICAgICByZXR1cm4gY29uc3VtZU51bWJlcihyYW5nZSwgVmFsdWVSYW5nZUFsbCk7CiAKKyAg ICBpZiAodG9rZW4udHlwZSgpICE9IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBudWxs cHRyOworCiAgICAgLy8gIltGb3IgY2FsYygpXSwgdGhlIHVzZWQgdmFsdWUgcmVzdWx0aW5nIGZy b20gYW4gZXhwcmVzc2lvbiBtdXN0IGJlIGNsYW1wZWQgdG8gdGhlIHJhbmdlIGFsbG93ZWQgaW4g dGhlIHRhcmdldCBjb250ZXh0LiIKICAgICBDYWxjUGFyc2VyIGNhbGNQYXJzZXIocmFuZ2UsIENh bGN1bGF0aW9uQ2F0ZWdvcnk6Ok51bWJlciwgVmFsdWVSYW5nZUFsbCk7CiAgICAgZG91YmxlIHJl c3VsdDsKQEAgLTI4MCw5ICszMDAsMTQgQEAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25z dW1lTGVuZ3RoKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBDU1NQYXJzZXJNb2QKICAgICAg ICAgQ1NTUHJpbWl0aXZlVmFsdWU6OlVuaXRUeXBlIHVuaXRUeXBlID0gQ1NTUHJpbWl0aXZlVmFs dWU6OlVuaXRUeXBlOjpDU1NfUFg7CiAgICAgICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmds ZXRvbigpLmNyZWF0ZVZhbHVlKHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCkubnVt ZXJpY1ZhbHVlKCksIHVuaXRUeXBlKTsKICAgICB9CisKKyAgICBpZiAodG9rZW4udHlwZSgpICE9 IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBudWxscHRyOworCiAgICAgQ2FsY1BhcnNl ciBjYWxjUGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpMZW5ndGgsIHZhbHVlUmFu Z2UpOwogICAgIGlmIChjYWxjUGFyc2VyLnZhbHVlKCkgJiYgY2FsY1BhcnNlci52YWx1ZSgpLT5j YXRlZ29yeSgpID09IENhbGN1bGF0aW9uQ2F0ZWdvcnk6Okxlbmd0aCkKICAgICAgICAgcmV0dXJu IGNhbGNQYXJzZXIuY29uc3VtZVZhbHVlKCk7CisKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIApA QCAtMjk0LDYgKzMxOSwxMCBAQCBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVQZXJj ZW50KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBWYWx1ZVJhbmdlCiAgICAgICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCku Y3JlYXRlVmFsdWUocmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKS5udW1lcmljVmFs dWUoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OlVuaXRUeXBlOjpDU1NfUEVSQ0VOVEFHRSk7CiAgICAg fQorCisgICAgaWYgKHRva2VuLnR5cGUoKSAhPSBGdW5jdGlvblRva2VuKQorICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKwogICAgIENhbGNQYXJzZXIgY2FsY1BhcnNlcihyYW5nZSwgQ2FsY3VsYXRp b25DYXRlZ29yeTo6UGVyY2VudCwgdmFsdWVSYW5nZSk7CiAgICAgaWYgKGNvbnN0IENTU0NhbGNW YWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZhbHVlKCkpIHsKICAgICAgICAgaWYgKGNh bGN1bGF0aW9uLT5jYXRlZ29yeSgpID09IENhbGN1bGF0aW9uQ2F0ZWdvcnk6OlBlcmNlbnQpCkBA IC0zMjMsNiArMzUyLDEwIEBAIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUxlbmd0 aE9yUGVyY2VudChDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgQ1NTCiAgICAgICAgIHJldHVy biBjb25zdW1lTGVuZ3RoKHJhbmdlLCBjc3NQYXJzZXJNb2RlLCB2YWx1ZVJhbmdlLCB1bml0bGVz cyk7CiAgICAgaWYgKHRva2VuLnR5cGUoKSA9PSBQZXJjZW50YWdlVG9rZW4pCiAgICAgICAgIHJl dHVybiBjb25zdW1lUGVyY2VudChyYW5nZSwgdmFsdWVSYW5nZSk7CisKKyAgICBpZiAodG9rZW4u dHlwZSgpICE9IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBudWxscHRyOworCiAgICAg Q2FsY1BhcnNlciBjYWxjUGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpMZW5ndGgs IHZhbHVlUmFuZ2UpOwogICAgIGlmIChjb25zdCBDU1NDYWxjVmFsdWUqIGNhbGN1bGF0aW9uID0g Y2FsY1BhcnNlci52YWx1ZSgpKSB7CiAgICAgICAgIGlmIChjYW5Db25zdW1lQ2FsY1ZhbHVlKGNh bGN1bGF0aW9uLT5jYXRlZ29yeSgpLCBjc3NQYXJzZXJNb2RlKSkKQEAgLTM0NSw5ICszNzgsMTIg QEAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lQW5nbGUoQ1NTUGFyc2VyVG9rZW5S YW5nZSYgcmFuZ2UsIENTU1BhcnNlck1vZGUKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgICAgICB9CiAgICAgfQotICAgIGlmICh0b2tlbi50eXBlKCkgPT0gTnVtYmVyVG9rZW4gJiYg c2hvdWxkQWNjZXB0VW5pdGxlc3NWYWx1ZSh0b2tlbi5udW1lcmljVmFsdWUoKSwgY3NzUGFyc2Vy TW9kZSwgdW5pdGxlc3MpKSB7CisKKyAgICBpZiAodG9rZW4udHlwZSgpID09IE51bWJlclRva2Vu ICYmIHNob3VsZEFjY2VwdFVuaXRsZXNzVmFsdWUodG9rZW4ubnVtZXJpY1ZhbHVlKCksIGNzc1Bh cnNlck1vZGUsIHVuaXRsZXNzKSkKICAgICAgICAgcmV0dXJuIENTU1ZhbHVlUG9vbDo6c2luZ2xl dG9uKCkuY3JlYXRlVmFsdWUocmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKS5udW1l cmljVmFsdWUoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OlVuaXRUeXBlOjpDU1NfREVHKTsKLSAgICB9 CisKKyAgICBpZiAodG9rZW4udHlwZSgpICE9IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgQ2FsY1BhcnNlciBjYWxjUGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlv bkNhdGVnb3J5OjpBbmdsZSwgVmFsdWVSYW5nZUFsbCk7CiAgICAgaWYgKGNvbnN0IENTU0NhbGNW YWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZhbHVlKCkpIHsKQEAgLTM3MSwxMSArNDA3 LDE2IEBAIHN0YXRpYyBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVBbmdsZU9yUGVy Y2VudChDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICAgICAgfQogICAgIH0KKwogICAgIGlmICh0b2tlbi50eXBlKCkgPT0gTnVtYmVyVG9r ZW4gJiYgc2hvdWxkQWNjZXB0VW5pdGxlc3NWYWx1ZSh0b2tlbi5udW1lcmljVmFsdWUoKSwgY3Nz UGFyc2VyTW9kZSwgdW5pdGxlc3MpKQogICAgICAgICByZXR1cm4gQ1NTVmFsdWVQb29sOjpzaW5n bGV0b24oKS5jcmVhdGVWYWx1ZShyYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLm51 bWVyaWNWYWx1ZSgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGU6OkNTU19ERUcpOworCiAg ICAgaWYgKHRva2VuLnR5cGUoKSA9PSBQZXJjZW50YWdlVG9rZW4pCiAgICAgICAgIHJldHVybiBj b25zdW1lUGVyY2VudChyYW5nZSwgdmFsdWVSYW5nZSk7CiAKKyAgICBpZiAodG9rZW4udHlwZSgp ICE9IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBudWxscHRyOworCiAgICAgQ2FsY1Bh cnNlciBjYWxjUGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpBbmdsZSwgdmFsdWVS YW5nZSk7CiAgICAgaWYgKGNvbnN0IENTU0NhbGNWYWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFy c2VyLnZhbHVlKCkpIHsKICAgICAgICAgaWYgKGNhbGN1bGF0aW9uLT5jYXRlZ29yeSgpID09IENh bGN1bGF0aW9uQ2F0ZWdvcnk6OkFuZ2xlKQpAQCAtMzg0LDcgKzQyNSw2IEBAIHN0YXRpYyBSZWZQ dHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVBbmdsZU9yUGVyY2VudChDU1NQYXJzZXJUb2tl blJhbmdlJiByYW5nCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLQogUmVmUHRyPENTU1ByaW1p dGl2ZVZhbHVlPiBjb25zdW1lVGltZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgQ1NTUGFy c2VyTW9kZSBjc3NQYXJzZXJNb2RlLCBWYWx1ZVJhbmdlIHZhbHVlUmFuZ2UsIFVuaXRsZXNzUXVp cmsgdW5pdGxlc3MpCiB7CiAgICAgY29uc3QgQ1NTUGFyc2VyVG9rZW4mIHRva2VuID0gcmFuZ2Uu cGVlaygpOwpAQCAtMzk5LDYgKzQzOSwxMCBAQCBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNv bnN1bWVUaW1lKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBDU1NQYXJzZXJNb2RlCiAgICAg ICAgICAgICByZXR1cm4gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVWYWx1ZShyYW5n ZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLm51bWVyaWNWYWx1ZSgpLCB1bml0KTsKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQorCisgICAgaWYgKHRva2VuLnR5cGUoKSAhPSBG dW5jdGlvblRva2VuKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKwogICAgIENhbGNQYXJzZXIg Y2FsY1BhcnNlcihyYW5nZSwgQ2FsY3VsYXRpb25DYXRlZ29yeTo6VGltZSwgdmFsdWVSYW5nZSk7 CiAgICAgaWYgKGNvbnN0IENTU0NhbGNWYWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZh bHVlKCkpIHsKICAgICAgICAgaWYgKGNhbGN1bGF0aW9uLT5jYXRlZ29yeSgpID09IENhbGN1bGF0 aW9uQ2F0ZWdvcnk6OlRpbWUpCg== 358174 2019-01-01 11:57:29 -0800 2019-01-02 11:59:02 -0800 Patch bug-193067-20190101115728.patch text/plain 8982 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjQyOTFjY2VmYzRmODI3 MWU0YmE4MjliN2UzMDQwYjEyYmNjZjBiYS4uYTEzYzc0NDA1YTY4ZWRhMDA0NzM5NGUzOTQ1YTAz Y2RhOGE1YzMyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTAxLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IHNwaW4g dXAgYSBDYWxjUGFyc2VyIGlmIHRoZSBjdXJyZW50IHRva2VuIGlzIG5vdCBhIGZ1bmN0aW9uIHRv a2VuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMw NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWYXJp b3VzIGZ1bmN0aW9ucyBpbiBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMgZmFsbCBiYWNrIHRvIHRy eWluZyB0byBwYXJzZQorICAgICAgICBhIGNhbGMgZXhwcmVzc2lvbiBpZiB0aGUgbm9ybWFsIHBh cnNpbmcgZmFpbHMuIERvbid0IGRvIHRoaXMgdW5sZXNzIHRoZQorICAgICAgICBjdXJyZW50IHRv a2VuIGlzIGEgZnVuY3Rpb24gdG9rZW4sIHdoaWNoIHNob3VsZCBiZSBzbGlnaHRseSBtb3JlIGVm ZmljaWVudC4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJz LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6Y29uc3Vt ZUludGVnZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpj b25zdW1lUG9zaXRpdmVJbnRlZ2VyUmF3KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5 UGFyc2VySGVscGVyczo6Y29uc3VtZU51bWJlclJhdyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ cm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVOdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lRm9udFdlaWdodE51bWJlcik6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVMZW5ndGgpOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lUGVyY2Vu dCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OmNvbnN1bWVM ZW5ndGhPclBlcmNlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxw ZXJzOjpjb25zdW1lQW5nbGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJI ZWxwZXJzOjpjb25zdW1lQW5nbGVPclBlcmNlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJv cGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lVGltZSk6CisKIDIwMTgtMTItMjEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJUQ1J0cFNlbmRlci5zZXRQYXJh bWV0ZXJzKCkgZG9lcyBzZXQgYWN0aXZlIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwCmluZGV4IDAzYjEx YWUzM2FjNTUxMmVmYTEyZWNmNmEzMWVmZWM0OWY3Y2IzZDAuLjhlZmY0NWIzNmY1ZDQ0NzBlNGZk NzczMGVjODFjZTkxNmJjMGIwY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHAKQEAgLTEzOSw2ICsxMzksMTAgQEAg UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lSW50ZWdlcihDU1NQYXJzZXJUb2tlblJh bmdlJiByYW5nZSwgZG91YmxlIG1pbmkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAg ICAgICByZXR1cm4gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVWYWx1ZShyYW5nZS5j b25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLm51bWVyaWNWYWx1ZSgpLCBDU1NQcmltaXRpdmVW YWx1ZTo6VW5pdFR5cGU6OkNTU19OVU1CRVIpOwogICAgIH0KKworICAgIGlmICh0b2tlbi50eXBl KCkgIT0gRnVuY3Rpb25Ub2tlbikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKICAgICBDYWxj UGFyc2VyIGNhbGNQYXJzZXIocmFuZ2UsIENhbGN1bGF0aW9uQ2F0ZWdvcnk6Ok51bWJlcik7CiAg ICAgaWYgKGNvbnN0IENTU0NhbGNWYWx1ZSogY2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZhbHVl KCkpIHsKICAgICAgICAgaWYgKGNhbGN1bGF0aW9uLT5jYXRlZ29yeSgpICE9IENhbGN1bGF0aW9u Q2F0ZWdvcnk6Ok51bWJlciB8fCAhY2FsY3VsYXRpb24tPmlzSW50KCkpCkBAIC0xNDgsNiArMTUy LDcgQEAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lSW50ZWdlcihDU1NQYXJzZXJU b2tlblJhbmdlJiByYW5nZSwgZG91YmxlIG1pbmkKICAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogICAgICAgICByZXR1cm4gY2FsY1BhcnNlci5jb25zdW1lTnVtYmVyKCk7CiAgICAgfQorCiAg ICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKQEAgLTE2NSwxNiArMTcwLDI1IEBAIGJvb2wgY29uc3Vt ZVBvc2l0aXZlSW50ZWdlclJhdyhDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgaW50JiByZXN1 bHQpCiAgICAgICAgIHJlc3VsdCA9IHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCku bnVtZXJpY1ZhbHVlKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KKworICAgIGlmICh0 b2tlbi50eXBlKCkgIT0gRnVuY3Rpb25Ub2tlbikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAg ICAgQ2FsY1BhcnNlciBjYWxjUGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpOdW1i ZXIpOwogICAgIHJldHVybiBjYWxjUGFyc2VyLmNvbnN1bWVQb3NpdGl2ZUludGVnZXJSYXcocmVz dWx0KTsKIH0KICAgICAKIGJvb2wgY29uc3VtZU51bWJlclJhdyhDU1NQYXJzZXJUb2tlblJhbmdl JiByYW5nZSwgZG91YmxlJiByZXN1bHQpCiB7Ci0gICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkg PT0gTnVtYmVyVG9rZW4pIHsKKyAgICBjb25zdCBDU1NQYXJzZXJUb2tlbiYgdG9rZW4gPSByYW5n ZS5wZWVrKCk7CisgICAgaWYgKHRva2VuLnR5cGUoKSA9PSBOdW1iZXJUb2tlbikgewogICAgICAg ICByZXN1bHQgPSByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLm51bWVyaWNWYWx1 ZSgpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CisKKyAgICBpZiAodG9rZW4udHlwZSgp ICE9IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIENhbGNQYXJz ZXIgY2FsY1BhcnNlcihyYW5nZSwgQ2FsY3VsYXRpb25DYXRlZ29yeTo6TnVtYmVyLCBWYWx1ZVJh bmdlQWxsKTsKICAgICByZXR1cm4gY2FsY1BhcnNlci5jb25zdW1lTnVtYmVyUmF3KHJlc3VsdCk7 CiB9CkBAIC0xODgsNiArMjAyLDEwIEBAIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3Vt ZU51bWJlcihDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgVmFsdWVSYW5nZSB2CiAgICAgICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIENTU1ZhbHVlUG9vbDo6c2luZ2xl dG9uKCkuY3JlYXRlVmFsdWUocmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKS5udW1l cmljVmFsdWUoKSwgdG9rZW4udW5pdFR5cGUoKSk7CiAgICAgfQorCisgICAgaWYgKHRva2VuLnR5 cGUoKSAhPSBGdW5jdGlvblRva2VuKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKwogICAgIENh bGNQYXJzZXIgY2FsY1BhcnNlcihyYW5nZSwgQ2FsY3VsYXRpb25DYXRlZ29yeTo6TnVtYmVyLCBW YWx1ZVJhbmdlQWxsKTsKICAgICBpZiAoY29uc3QgQ1NTQ2FsY1ZhbHVlKiBjYWxjdWxhdGlvbiA9 IGNhbGNQYXJzZXIudmFsdWUoKSkgewogICAgICAgICAvLyBGSVhNRTogQ2FsY3Mgc2hvdWxkIG5v dCBiZSBzdWJqZWN0IHRvIHBhcnNlIHRpbWUgcmFuZ2UgY2hlY2tzLgpAQCAtMTk2LDYgKzIxNCw3 IEBAIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZU51bWJlcihDU1NQYXJzZXJUb2tl blJhbmdlJiByYW5nZSwgVmFsdWVSYW5nZSB2CiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsK ICAgICAgICAgcmV0dXJuIGNhbGNQYXJzZXIuY29uc3VtZU51bWJlcigpOwogICAgIH0KKwogICAg IHJldHVybiBudWxscHRyOwogfQogCkBAIC0yMTcsNiArMjM2LDkgQEAgUmVmUHRyPENTU1ByaW1p dGl2ZVZhbHVlPiBjb25zdW1lRm9udFdlaWdodE51bWJlcihDU1NQYXJzZXJUb2tlblJhbmdlJiBy YW5nZSkKICAgICApCiAgICAgICAgIHJldHVybiBjb25zdW1lTnVtYmVyKHJhbmdlLCBWYWx1ZVJh bmdlQWxsKTsKIAorICAgIGlmICh0b2tlbi50eXBlKCkgIT0gRnVuY3Rpb25Ub2tlbikKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisKICAgICAvLyAiW0ZvciBjYWxjKCldLCB0aGUgdXNlZCB2YWx1 ZSByZXN1bHRpbmcgZnJvbSBhbiBleHByZXNzaW9uIG11c3QgYmUgY2xhbXBlZCB0byB0aGUgcmFu Z2UgYWxsb3dlZCBpbiB0aGUgdGFyZ2V0IGNvbnRleHQuIgogICAgIENhbGNQYXJzZXIgY2FsY1Bh cnNlcihyYW5nZSwgQ2FsY3VsYXRpb25DYXRlZ29yeTo6TnVtYmVyLCBWYWx1ZVJhbmdlQWxsKTsK ICAgICBkb3VibGUgcmVzdWx0OwpAQCAtMjgwLDkgKzMwMiwxNCBAQCBSZWZQdHI8Q1NTUHJpbWl0 aXZlVmFsdWU+IGNvbnN1bWVMZW5ndGgoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIENTU1Bh cnNlck1vZAogICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGUgdW5pdFR5cGUgPSBD U1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGU6OkNTU19QWDsKICAgICAgICAgcmV0dXJuIENTU1Zh bHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlVmFsdWUocmFuZ2UuY29uc3VtZUluY2x1ZGluZ1do aXRlc3BhY2UoKS5udW1lcmljVmFsdWUoKSwgdW5pdFR5cGUpOwogICAgIH0KKworICAgIGlmICh0 b2tlbi50eXBlKCkgIT0gRnVuY3Rpb25Ub2tlbikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisK ICAgICBDYWxjUGFyc2VyIGNhbGNQYXJzZXIocmFuZ2UsIENhbGN1bGF0aW9uQ2F0ZWdvcnk6Okxl bmd0aCwgdmFsdWVSYW5nZSk7CiAgICAgaWYgKGNhbGNQYXJzZXIudmFsdWUoKSAmJiBjYWxjUGFy c2VyLnZhbHVlKCktPmNhdGVnb3J5KCkgPT0gQ2FsY3VsYXRpb25DYXRlZ29yeTo6TGVuZ3RoKQog ICAgICAgICByZXR1cm4gY2FsY1BhcnNlci5jb25zdW1lVmFsdWUoKTsKKwogICAgIHJldHVybiBu dWxscHRyOwogfQogCkBAIC0yOTQsNiArMzIxLDEwIEBAIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1 ZT4gY29uc3VtZVBlcmNlbnQoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIFZhbHVlUmFuZ2UK ICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICByZXR1cm4gQ1NTVmFsdWVQb29s OjpzaW5nbGV0b24oKS5jcmVhdGVWYWx1ZShyYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFj ZSgpLm51bWVyaWNWYWx1ZSgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGU6OkNTU19QRVJD RU5UQUdFKTsKICAgICB9CisKKyAgICBpZiAodG9rZW4udHlwZSgpICE9IEZ1bmN0aW9uVG9rZW4p CisgICAgICAgIHJldHVybiBudWxscHRyOworCiAgICAgQ2FsY1BhcnNlciBjYWxjUGFyc2VyKHJh bmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpQZXJjZW50LCB2YWx1ZVJhbmdlKTsKICAgICBpZiAo Y29uc3QgQ1NTQ2FsY1ZhbHVlKiBjYWxjdWxhdGlvbiA9IGNhbGNQYXJzZXIudmFsdWUoKSkgewog ICAgICAgICBpZiAoY2FsY3VsYXRpb24tPmNhdGVnb3J5KCkgPT0gQ2FsY3VsYXRpb25DYXRlZ29y eTo6UGVyY2VudCkKQEAgLTMyMyw2ICszNTQsMTAgQEAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVl PiBjb25zdW1lTGVuZ3RoT3JQZXJjZW50KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBDU1MK ICAgICAgICAgcmV0dXJuIGNvbnN1bWVMZW5ndGgocmFuZ2UsIGNzc1BhcnNlck1vZGUsIHZhbHVl UmFuZ2UsIHVuaXRsZXNzKTsKICAgICBpZiAodG9rZW4udHlwZSgpID09IFBlcmNlbnRhZ2VUb2tl bikKICAgICAgICAgcmV0dXJuIGNvbnN1bWVQZXJjZW50KHJhbmdlLCB2YWx1ZVJhbmdlKTsKKwor ICAgIGlmICh0b2tlbi50eXBlKCkgIT0gRnVuY3Rpb25Ub2tlbikKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKICAgICBDYWxjUGFyc2VyIGNhbGNQYXJzZXIocmFuZ2UsIENhbGN1bGF0aW9uQ2F0 ZWdvcnk6Okxlbmd0aCwgdmFsdWVSYW5nZSk7CiAgICAgaWYgKGNvbnN0IENTU0NhbGNWYWx1ZSog Y2FsY3VsYXRpb24gPSBjYWxjUGFyc2VyLnZhbHVlKCkpIHsKICAgICAgICAgaWYgKGNhbkNvbnN1 bWVDYWxjVmFsdWUoY2FsY3VsYXRpb24tPmNhdGVnb3J5KCksIGNzc1BhcnNlck1vZGUpKQpAQCAt MzQ1LDkgKzM4MCwxMiBAQCBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVBbmdsZShD U1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgQ1NTUGFyc2VyTW9kZQogICAgICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAgICAgICAgIH0KICAgICB9Ci0gICAgaWYgKHRva2VuLnR5cGUoKSA9PSBO dW1iZXJUb2tlbiAmJiBzaG91bGRBY2NlcHRVbml0bGVzc1ZhbHVlKHRva2VuLm51bWVyaWNWYWx1 ZSgpLCBjc3NQYXJzZXJNb2RlLCB1bml0bGVzcykpIHsKKworICAgIGlmICh0b2tlbi50eXBlKCkg PT0gTnVtYmVyVG9rZW4gJiYgc2hvdWxkQWNjZXB0VW5pdGxlc3NWYWx1ZSh0b2tlbi5udW1lcmlj VmFsdWUoKSwgY3NzUGFyc2VyTW9kZSwgdW5pdGxlc3MpKQogICAgICAgICByZXR1cm4gQ1NTVmFs dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVWYWx1ZShyYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hp dGVzcGFjZSgpLm51bWVyaWNWYWx1ZSgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGU6OkNT U19ERUcpOwotICAgIH0KKworICAgIGlmICh0b2tlbi50eXBlKCkgIT0gRnVuY3Rpb25Ub2tlbikK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBDYWxjUGFyc2VyIGNhbGNQYXJzZXIocmFu Z2UsIENhbGN1bGF0aW9uQ2F0ZWdvcnk6OkFuZ2xlLCBWYWx1ZVJhbmdlQWxsKTsKICAgICBpZiAo Y29uc3QgQ1NTQ2FsY1ZhbHVlKiBjYWxjdWxhdGlvbiA9IGNhbGNQYXJzZXIudmFsdWUoKSkgewpA QCAtMzcxLDExICs0MDksMTYgQEAgc3RhdGljIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29u c3VtZUFuZ2xlT3JQZXJjZW50KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmcKICAgICAgICAgICAg IHJldHVybiBudWxscHRyOwogICAgICAgICB9CiAgICAgfQorCiAgICAgaWYgKHRva2VuLnR5cGUo KSA9PSBOdW1iZXJUb2tlbiAmJiBzaG91bGRBY2NlcHRVbml0bGVzc1ZhbHVlKHRva2VuLm51bWVy aWNWYWx1ZSgpLCBjc3NQYXJzZXJNb2RlLCB1bml0bGVzcykpCiAgICAgICAgIHJldHVybiBDU1NW YWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZVZhbHVlKHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdX aGl0ZXNwYWNlKCkubnVtZXJpY1ZhbHVlKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZTo6 Q1NTX0RFRyk7CisKICAgICBpZiAodG9rZW4udHlwZSgpID09IFBlcmNlbnRhZ2VUb2tlbikKICAg ICAgICAgcmV0dXJuIGNvbnN1bWVQZXJjZW50KHJhbmdlLCB2YWx1ZVJhbmdlKTsKIAorICAgIGlm ICh0b2tlbi50eXBlKCkgIT0gRnVuY3Rpb25Ub2tlbikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKICAgICBDYWxjUGFyc2VyIGNhbGNQYXJzZXIocmFuZ2UsIENhbGN1bGF0aW9uQ2F0ZWdvcnk6 OkFuZ2xlLCB2YWx1ZVJhbmdlKTsKICAgICBpZiAoY29uc3QgQ1NTQ2FsY1ZhbHVlKiBjYWxjdWxh dGlvbiA9IGNhbGNQYXJzZXIudmFsdWUoKSkgewogICAgICAgICBpZiAoY2FsY3VsYXRpb24tPmNh dGVnb3J5KCkgPT0gQ2FsY3VsYXRpb25DYXRlZ29yeTo6QW5nbGUpCkBAIC0zODQsNyArNDI3LDYg QEAgc3RhdGljIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUFuZ2xlT3JQZXJjZW50 KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmcKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotCiBS ZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVUaW1lKENTU1BhcnNlclRva2VuUmFuZ2Um IHJhbmdlLCBDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUsIFZhbHVlUmFuZ2UgdmFsdWVSYW5n ZSwgVW5pdGxlc3NRdWlyayB1bml0bGVzcykKIHsKICAgICBjb25zdCBDU1NQYXJzZXJUb2tlbiYg dG9rZW4gPSByYW5nZS5wZWVrKCk7CkBAIC0zOTksNiArNDQxLDEwIEBAIFJlZlB0cjxDU1NQcmlt aXRpdmVWYWx1ZT4gY29uc3VtZVRpbWUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIENTU1Bh cnNlck1vZGUKICAgICAgICAgICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy ZWF0ZVZhbHVlKHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCkubnVtZXJpY1ZhbHVl KCksIHVuaXQpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CisKKyAgICBpZiAodG9r ZW4udHlwZSgpICE9IEZ1bmN0aW9uVG9rZW4pCisgICAgICAgIHJldHVybiBudWxscHRyOworCiAg ICAgQ2FsY1BhcnNlciBjYWxjUGFyc2VyKHJhbmdlLCBDYWxjdWxhdGlvbkNhdGVnb3J5OjpUaW1l LCB2YWx1ZVJhbmdlKTsKICAgICBpZiAoY29uc3QgQ1NTQ2FsY1ZhbHVlKiBjYWxjdWxhdGlvbiA9 IGNhbGNQYXJzZXIudmFsdWUoKSkgewogICAgICAgICBpZiAoY2FsY3VsYXRpb24tPmNhdGVnb3J5 KCkgPT0gQ2FsY3VsYXRpb25DYXRlZ29yeTo6VGltZSkK