155873 2016-03-24 22:34:15 -0700 RegExp constructor should use Symbol.match and other properties 2016-04-06 11:48:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 156299 1 keith_miller keith_miller commit-queue mark.lam msaboff saam oldest_to_newest 1177894 0 keith_miller 2016-03-24 22:34:15 -0700 RegExp constructor should use Symbol.match and other properties 1177985 1 274911 keith_miller 2016-03-25 09:42:20 -0700 Created attachment 274911 Patch 1178020 2 274911 msaboff 2016-03-25 10:59:59 -0700 Comment on attachment 274911 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274911&action=review r=me > Source/JavaScriptCore/runtime/RegExpConstructor.cpp:281 > // ECMA 15.10.4 Please update the spec reference. 1180582 3 275594 keith_miller 2016-04-04 16:59:21 -0700 Created attachment 275594 Patch for landing 1180709 4 275594 commit-queue 2016-04-04 22:16:05 -0700 Comment on attachment 275594 Patch for landing Rejecting attachment 275594 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: : *** Waiting for unfinished jobs.... make: *** [Bytecodes.h] Error 1 perl JavaScriptCore/Scripts/xxd.pl InjectedScriptSource_js ./InjectedScriptSource.min.js InjectedScriptSource.h rm -f InjectedScriptSource.min.js Command /bin/sh failed with exit code 2 ** BUILD FAILED ** The following build commands failed: PhaseScriptExecution Generate\ Derived\ Sources /Volumes/Data/EWS/WebKit/WebKitBuild/JavaScriptCore.build/Release/Derived\ Sources.build/Script-65FB3F6509D11E9100F49DEB.sh (1 failure) Full output: http://webkit-queues.webkit.org/results/1101397 1181282 5 275780 keith_miller 2016-04-06 10:26:42 -0700 Created attachment 275780 Patch for landing 1181309 6 275780 commit-queue 2016-04-06 11:26:14 -0700 Comment on attachment 275780 Patch for landing Clearing flags on attachment: 275780 Committed r199106: <http://trac.webkit.org/changeset/199106> 1181310 7 commit-queue 2016-04-06 11:26:17 -0700 All reviewed patches have been landed. Closing bug. 1181317 8 commit-queue 2016-04-06 11:40:56 -0700 Re-opened since this is blocked by bug 156299 1181326 9 keith_miller 2016-04-06 11:48:19 -0700 Requested rollout on the wrong patch. 274911 2016-03-25 09:42:20 -0700 2016-04-04 16:59:19 -0700 Patch bug-155873-20160325094221.patch text/plain 11610 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YWZlNjBmY2MwZTZmODJhZjk2ZDRmNTc5ZDQ1ZGU4OTg2ZTAzMTJkLi4wMWM3MTIwNTAwNGMwZDMz ZjQ5NjFkMGQ0Y2U3NDU0OWYwYjI2MGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNi0wMy0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBSZWdFeHAgY29uc3RydWN0b3Igc2hvdWxkIHVzZSBTeW1ib2wubWF0 Y2ggYW5kIG90aGVyIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NTg3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggdXBkYXRlcyB0aGUgYmVoYXZpb3Igb2YgdGhlIFJl Z0V4cCBjb25zdHJ1Y3Rvci4gTm93IHRoZSBjb25zdHJ1Y3RvcgorICAgICAgICBzaG91bGQgZ2V0 IHRoZSBTeW1ib2wubWF0Y2ggcHJvcGVydHkgYW5kIGNoZWNrIGlmIGl0IGV4aXN0cyB0byBkZWNp ZGUgaWYgc29tZXRoaW5nCisgICAgICAgIHNob3VsZCBiZSBjb25zdHJ1Y3RlZCBsaWtlIGEgcmVn ZXhwIG9iamVjdC4KKworICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuY3BwOgor ICAgICAgICAoSlNDOjp0b0ZsYWdzKToKKyAgICAgICAgKEpTQzo6Y29uc3RydWN0UmVnRXhwKToK KyAgICAgICAgKEpTQzo6Y29uc3RydWN0V2l0aFJlZ0V4cENvbnN0cnVjdG9yKToKKyAgICAgICAg KEpTQzo6Y2FsbFJlZ0V4cENvbnN0cnVjdG9yKToKKyAgICAgICAgKiBydW50aW1lL1JlZ0V4cENv bnN0cnVjdG9yLmg6CisgICAgICAgICogdGVzdHMvc3RyZXNzL3JlZ2V4cC1jb25zdHJ1Y3Rvci5q czogQWRkZWQuCisgICAgICAgIChhc3NlcnQpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yLmdl dCBsZXQpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yLik6CisgICAgICAgICh0aHJvdy5uZXcu RXJyb3IuZ2V0IHJlKToKKwogMjAxNi0wMy0yNCAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxl LmNvbT4KIAogICAgICAgICBFUzY6IEltcGxlbWVudCBJc1JlZ0V4cCBmdW5jdGlvbiBhbmQgdXNl IHdoZXJlIG5lZWRlZCBpbiBTdHJpbmcucHJvdG90eXBlLiogbWV0aG9kcwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuY3BwCmluZGV4IDc1 OWVkYTA2YTZlYWIzNjk3NWFmNTVlMGNlNWYzOTMyYTFhNWE4MTguLjAyNjE4Yzk1ZTYxNmNlZjI2 YjgzMjFhYzVmOWVjMDliMzMxZmM0MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1JlZ0V4cENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rvci5jcHAKQEAgLTI2MCw0NiArMjYwLDc0IEBAIGlu bGluZSBTdHJ1Y3R1cmUqIGdldFJlZ0V4cFN0cnVjdHVyZShFeGVjU3RhdGUqIGV4ZWMsIEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplCiAgICAgcmV0dXJuIHN0cnVjdHVyZTsKIH0KIAoraW5saW5l IFJlZ0V4cEZsYWdzIHRvRmxhZ3MoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGZsYWdzKQorewor ICAgIGlmIChmbGFncy5pc1VuZGVmaW5lZCgpKQorICAgICAgICByZXR1cm4gTm9GbGFnczsKKyAg ICBKU1N0cmluZyogZmxhZ3NTdHJpbmcgPSBmbGFncy50b1N0cmluZyhleGVjKTsKKyAgICBpZiAo IWZsYWdzU3RyaW5nKSB7CisgICAgICAgIEFTU0VSVChleGVjLT5oYWRFeGNlcHRpb24oKSk7Cisg ICAgICAgIHJldHVybiBJbnZhbGlkRmxhZ3M7CisgICAgfQorCisgICAgUmVnRXhwRmxhZ3MgcmVz dWx0ID0gcmVnRXhwRmxhZ3MoZmxhZ3NTdHJpbmctPnZhbHVlKGV4ZWMpKTsKKyAgICBpZiAoZXhl Yy0+aGFkRXhjZXB0aW9uKCkpCisgICAgICAgIHJldHVybiBJbnZhbGlkRmxhZ3M7CisgICAgaWYg KHJlc3VsdCA9PSBJbnZhbGlkRmxhZ3MpCisgICAgICAgIHRocm93U3ludGF4RXJyb3IoZXhlYywg QVNDSUlMaXRlcmFsKCJJbnZhbGlkIGZsYWdzIHN1cHBsaWVkIHRvIFJlZ0V4cCBjb25zdHJ1Y3Rv ci4iKSk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogLy8gRUNNQSAxNS4xMC40Ci1KU09iamVj dCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxPYmplY3QqIGdsb2Jh bE9iamVjdCwgY29uc3QgQXJnTGlzdCYgYXJncywgSlNWYWx1ZSBuZXdUYXJnZXQpCitKU09iamVj dCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxPYmplY3QqIGdsb2Jh bE9iamVjdCwgY29uc3QgQXJnTGlzdCYgYXJncywgIEpTT2JqZWN0KiBjYWxsZWUsIEpTVmFsdWUg bmV3VGFyZ2V0KQogewotICAgIEpTVmFsdWUgYXJnMCA9IGFyZ3MuYXQoMCk7Ci0gICAgSlNWYWx1 ZSBhcmcxID0gYXJncy5hdCgxKTsKLQogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7Ci0gICAgUmVn RXhwRmxhZ3MgZmxhZ3MgPSBOb0ZsYWdzOwotICAgIGJvb2wgaGF2ZUZsYWdzID0gZmFsc2U7Ci0g ICAgaWYgKCFhcmcxLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgZmxhZ3MgPSByZWdFeHBGbGFn cyhhcmcxLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSk7CisgICAgSlNWYWx1ZSBwYXR0ZXJu QXJnID0gYXJncy5hdCgwKTsKKyAgICBKU1ZhbHVlIGZsYWdzQXJnID0gYXJncy5hdCgxKTsKKwor ICAgIGJvb2wgaXNQYXR0ZXJuUmVnRXhwID0gcGF0dGVybkFyZy5pbmhlcml0cyhSZWdFeHBPYmpl Y3Q6OmluZm8oKSk7CisgICAgYm9vbCBjb25zdHJ1Y3RBc1JlZ2V4cCA9IGlzUmVnRXhwKHZtLCBl eGVjLCBwYXR0ZXJuQXJnKTsKKworICAgIGlmIChuZXdUYXJnZXQuaXNVbmRlZmluZWQoKSAmJiBj b25zdHJ1Y3RBc1JlZ2V4cCAmJiBmbGFnc0FyZy5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgIEpT VmFsdWUgY29uc3RydWN0b3IgPSBwYXR0ZXJuQXJnLmdldChleGVjLCB2bS5wcm9wZXJ0eU5hbWVz LT5jb25zdHJ1Y3Rvcik7CiAgICAgICAgIGlmICh2bS5leGNlcHRpb24oKSkKLSAgICAgICAgICAg IHJldHVybiAwOwotICAgICAgICBpZiAoZmxhZ3MgPT0gSW52YWxpZEZsYWdzKQotICAgICAgICAg ICAgcmV0dXJuIHZtLnRocm93RXhjZXB0aW9uKGV4ZWMsIGNyZWF0ZVN5bnRheEVycm9yKGV4ZWMs IEFTQ0lJTGl0ZXJhbCgiSW52YWxpZCBmbGFncyBzdXBwbGllZCB0byBSZWdFeHAgY29uc3RydWN0 b3IuIikpKTsKLSAgICAgICAgaGF2ZUZsYWdzID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBu dWxscHRyOworICAgICAgICBpZiAoY2FsbGVlID09IGNvbnN0cnVjdG9yKSB7CisgICAgICAgICAg ICAvLyBXZSBrbm93IHRoYXQgcGF0dGVybkFyZyBpcyBhIG9iamVjdCBvdGhlcndpc2UgY29uc3Ry dWN0QXNSZWdleHAgd291bGQgYmUgZmFsc2UuCisgICAgICAgICAgICByZXR1cm4gcGF0dGVybkFy Zy5nZXRPYmplY3QoKTsKKyAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChhcmcwLmluaGVyaXRz KFJlZ0V4cE9iamVjdDo6aW5mbygpKSkgewotICAgICAgICAvLyBJZiBjYWxsZWQgYXMgYSBmdW5j dGlvbiwgdGhpcyBqdXN0IHJldHVybnMgdGhlIGZpcnN0IGFyZ3VtZW50IChzZWUgMTUuMTAuMy4x KS4KLSAgICAgICAgaWYgKG5ld1RhcmdldCAhPSBqc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgICAg ICBSZWdFeHAqIHJlZ0V4cCA9IHN0YXRpY19jYXN0PFJlZ0V4cE9iamVjdCo+KGFzT2JqZWN0KGFy ZzApKS0+cmVnRXhwKCk7Ci0gICAgICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGdldFJl Z0V4cFN0cnVjdHVyZShleGVjLCBnbG9iYWxPYmplY3QsIG5ld1RhcmdldCk7Ci0gICAgICAgICAg ICBpZiAodm0uZXhjZXB0aW9uKCkpCisgICAgaWYgKGlzUGF0dGVyblJlZ0V4cCkgeworICAgICAg ICBSZWdFeHAqIHJlZ0V4cCA9IGpzQ2FzdDxSZWdFeHBPYmplY3QqPihwYXR0ZXJuQXJnKS0+cmVn RXhwKCk7CisgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gZ2V0UmVnRXhwU3RydWN0dXJl KGV4ZWMsIGdsb2JhbE9iamVjdCwgbmV3VGFyZ2V0KTsKKyAgICAgICAgaWYgKGV4ZWMtPmhhZEV4 Y2VwdGlvbigpKQorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAgICAgaWYgKCFm bGFnc0FyZy5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgICAgICBSZWdFeHBGbGFncyBmbGFncyA9 IHRvRmxhZ3MoZXhlYywgZmxhZ3NBcmcpOworICAgICAgICAgICAgaWYgKGZsYWdzID09IEludmFs aWRGbGFncykKICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJl Z0V4cCA9IFJlZ0V4cDo6Y3JlYXRlKHZtLCByZWdFeHAtPnBhdHRlcm4oKSwgZmxhZ3MpOworICAg ICAgICB9CiAKLSAgICAgICAgICAgIGlmIChoYXZlRmxhZ3MpIHsKLSAgICAgICAgICAgICAgICBy ZWdFeHAgPSBSZWdFeHA6OmNyZWF0ZSh2bSwgcmVnRXhwLT5wYXR0ZXJuKCksIGZsYWdzKTsKLSAg ICAgICAgICAgICAgICBpZiAodm0uZXhjZXB0aW9uKCkpCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybiBudWxscHRyOwotICAgICAgICAgICAgfQorICAgICAgICByZXR1cm4gUmVnRXhwT2JqZWN0 OjpjcmVhdGUoZXhlYy0+dm0oKSwgc3RydWN0dXJlLCByZWdFeHApOworICAgIH0KIAotICAgICAg ICAgICAgcmV0dXJuIFJlZ0V4cE9iamVjdDo6Y3JlYXRlKHZtLCBzdHJ1Y3R1cmUsIHJlZ0V4cCk7 Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIGFzT2JqZWN0KGFyZzApOworICAgIGlmIChjb25z dHJ1Y3RBc1JlZ2V4cCkgeworICAgICAgICBKU1ZhbHVlIHBhdHRlcm4gPSBwYXR0ZXJuQXJnLmdl dChleGVjLCB2bS5wcm9wZXJ0eU5hbWVzLT5zb3VyY2UpOworICAgICAgICBpZiAoZmxhZ3NBcmcu aXNVbmRlZmluZWQoKSkKKyAgICAgICAgICAgIGZsYWdzQXJnID0gcGF0dGVybkFyZy5nZXQoZXhl Yywgdm0ucHJvcGVydHlOYW1lcy0+ZmxhZ3MpOworICAgICAgICBwYXR0ZXJuQXJnID0gcGF0dGVy bjsKICAgICB9CiAKLSAgICBTdHJpbmcgcGF0dGVybiA9IGFyZzAuaXNVbmRlZmluZWQoKSA/IGVt cHR5U3RyaW5nKCkgOiBhcmcwLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKTsKLSAgICBpZiAo dm0uZXhjZXB0aW9uKCkpCi0gICAgICAgIHJldHVybiAwOworICAgIFN0cmluZyBwYXR0ZXJuID0g cGF0dGVybkFyZy5pc1VuZGVmaW5lZCgpID8gZW1wdHlTdHJpbmcoKSA6IHBhdHRlcm5BcmcudG9T dHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpOworICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBSZWdFeHBGbGFncyBmbGFncyA9IHRvRmxh Z3MoZXhlYywgZmxhZ3NBcmcpOworICAgIGlmIChmbGFncyA9PSBJbnZhbGlkRmxhZ3MpCisgICAg ICAgIHJldHVybiBudWxscHRyOwogCiAgICAgUmVnRXhwKiByZWdFeHAgPSBSZWdFeHA6OmNyZWF0 ZSh2bSwgcGF0dGVybiwgZmxhZ3MpOwogICAgIGlmICghcmVnRXhwLT5pc1ZhbGlkKCkpCkBAIC0z MTQsNyArMzQyLDcgQEAgSlNPYmplY3QqIGNvbnN0cnVjdFJlZ0V4cChFeGVjU3RhdGUqIGV4ZWMs IEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIGNvbnN0IEEKIHN0YXRpYyBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnN0cnVjdFdpdGhSZWdFeHBDb25zdHJ1Y3RvcihFeGVjU3Rh dGUqIGV4ZWMpCiB7CiAgICAgQXJnTGlzdCBhcmdzKGV4ZWMpOwotICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5j YWxsZWUoKSktPmdsb2JhbE9iamVjdCgpLCBhcmdzLCBleGVjLT5uZXdUYXJnZXQoKSkpOworICAg IHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50ZXJuYWxG dW5jdGlvbihleGVjLT5jYWxsZWUoKSktPmdsb2JhbE9iamVjdCgpLCBhcmdzLCBleGVjLT5jYWxs ZWUoKSwgZXhlYy0+bmV3VGFyZ2V0KCkpKTsKIH0KIAogQ29uc3RydWN0VHlwZSBSZWdFeHBDb25z dHJ1Y3Rvcjo6Z2V0Q29uc3RydWN0RGF0YShKU0NlbGwqLCBDb25zdHJ1Y3REYXRhJiBjb25zdHJ1 Y3REYXRhKQpAQCAtMzI3LDcgKzM1NSw3IEBAIENvbnN0cnVjdFR5cGUgUmVnRXhwQ29uc3RydWN0 b3I6OmdldENvbnN0cnVjdERhdGEoSlNDZWxsKiwgQ29uc3RydWN0RGF0YSYgY29uc3RyCiBzdGF0 aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjYWxsUmVnRXhwQ29uc3RydWN0b3IoRXhl Y1N0YXRlKiBleGVjKQogewogICAgIEFyZ0xpc3QgYXJncyhleGVjKTsKLSAgICByZXR1cm4gSlNW YWx1ZTo6ZW5jb2RlKGNvbnN0cnVjdFJlZ0V4cChleGVjLCBhc0ludGVybmFsRnVuY3Rpb24oZXhl Yy0+Y2FsbGVlKCkpLT5nbG9iYWxPYmplY3QoKSwgYXJncykpOworICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5j YWxsZWUoKSktPmdsb2JhbE9iamVjdCgpLCBhcmdzLCBleGVjLT5jYWxsZWUoKSkpOwogfQogCiBD YWxsVHlwZSBSZWdFeHBDb25zdHJ1Y3Rvcjo6Z2V0Q2FsbERhdGEoSlNDZWxsKiwgQ2FsbERhdGEm IGNhbGxEYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVn RXhwQ29uc3RydWN0b3IuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cENv bnN0cnVjdG9yLmgKaW5kZXggMmUwYTFkNjNlZGEyY2Q5OTRjMWQxOGI4MDUyYjIyODZiZjkyOGQ5 Mi4uN2Y0NjZjYWM4ODZiNjFhZGUxOGM4MTYzMDJiYzIyNDhmNzM5OTEzNyAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rvci5oCkBAIC04NSw3 ICs4NSw3IEBAIHByaXZhdGU6CiAKIFJlZ0V4cENvbnN0cnVjdG9yKiBhc1JlZ0V4cENvbnN0cnVj dG9yKEpTVmFsdWUpOwogCi1KU09iamVjdCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSosIEpT R2xvYmFsT2JqZWN0KiwgY29uc3QgQXJnTGlzdCYsIEpTVmFsdWUgbmV3VGFyZ2V0ID0ganNVbmRl ZmluZWQoKSk7CitKU09iamVjdCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSosIEpTR2xvYmFs T2JqZWN0KiwgY29uc3QgQXJnTGlzdCYsIEpTT2JqZWN0KiBjYWxsZWUgPSBudWxscHRyLCBKU1Zh bHVlIG5ld1RhcmdldCA9IGpzVW5kZWZpbmVkKCkpOwogCiBpbmxpbmUgUmVnRXhwQ29uc3RydWN0 b3IqIGFzUmVnRXhwQ29uc3RydWN0b3IoSlNWYWx1ZSB2YWx1ZSkKIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVnZXhwLWNvbnN0cnVjdG9yLmpzIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9yZWdleHAtY29uc3RydWN0b3IuanMK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uNjc2NDk0ODkyY2EyYWRhY2QxMDFiNjUwMWExYzVlZDc4YmQxZjBiZgotLS0g L2Rldi9udWxsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVnZXhw LWNvbnN0cnVjdG9yLmpzCkBAIC0wLDAgKzEsNTEgQEAKK2Z1bmN0aW9uIGFzc2VydChjb25kaXRp b24pIHsKKyAgICBpZiAoIWNvbmRpdGlvbikKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJiYWQg YXNzZXJ0aW9uIik7Cit9CisKK3sKKyAgICBsZXQgZ2V0ID0gW107CisgICAgbGV0IHJlID0geyBj b25zdHJ1Y3RvcjogbnVsbCB9OworICAgIHJlW1N5bWJvbC5tYXRjaF0gPSB0cnVlOworICAgIGxl dCBwID0gbmV3IFByb3h5KHJlLCB7IGdldDogZnVuY3Rpb24obywgaykgeyBnZXQucHVzaChrKTsg cmV0dXJuIG9ba107IH19KTsKKyAgICBSZWdFeHAocCk7CisgICAgYXNzZXJ0KGdldFswXSA9PT0g U3ltYm9sLm1hdGNoICYmIGdldC5zbGljZSgxKSArICcnID09PSAiY29uc3RydWN0b3Isc291cmNl LGZsYWdzIik7CisKKyAgICBnZXQgPSBbXTsKKyAgICBSZWdFeHAocCwgIiIpOworICAgIGFzc2Vy dChnZXRbMF0gPT09IFN5bWJvbC5tYXRjaCAmJiBnZXQuc2xpY2UoMSkgKyAnJyA9PT0gInNvdXJj ZSIpOworCisgICAgZ2V0ID0gW107CisgICAgcmUuY29uc3RydWN0b3IgPSBSZWdFeHA7CisgICAg bGV0IHJlc3VsdCA9IFJlZ0V4cChwKTsKKyAgICBhc3NlcnQoZ2V0WzBdID09PSBTeW1ib2wubWF0 Y2ggJiYgZ2V0LnNsaWNlKDEpICsgJycgPT09ICJjb25zdHJ1Y3RvciIgJiYgcmVzdWx0ID09PSBw KTsKKworICAgIGdldCA9IFtdOworICAgIFJlZ0V4cChwLCAiIik7CisgICAgYXNzZXJ0KGdldFsw XSA9PT0gU3ltYm9sLm1hdGNoICYmIGdldC5zbGljZSgxKSArICcnID09PSAic291cmNlIik7CisK KyAgICBnZXQgPSBbXTsKKyAgICByZSA9IC9mb28vOworICAgIHAgPSBuZXcgUHJveHkocmUsIHsg Z2V0OiBmdW5jdGlvbihvLCBrKSB7IGdldC5wdXNoKGspOyByZXR1cm4gb1trXTsgfX0pOworICAg IFJlZ0V4cChwKTsKKyAgICBhc3NlcnQoZ2V0WzBdID09PSBTeW1ib2wubWF0Y2ggJiYgZ2V0LnNs aWNlKDEpICsgJycgPT09ICJjb25zdHJ1Y3RvciIpOworCisgICAgZ2V0ID0gW107CisgICAgcmUg PSAvZm9vLzsKKyAgICBwID0gbmV3IFByb3h5KHJlLCB7IGdldDogZnVuY3Rpb24obywgaykgeyBn ZXQucHVzaChrKTsgcmV0dXJuIG9ba107IH19KTsKKyAgICByZXN1bHQgPSBSZWdFeHAocCk7Cisg ICAgYXNzZXJ0KGdldFswXSA9PT0gU3ltYm9sLm1hdGNoICYmIGdldC5zbGljZSgxKSArICcnID09 PSAiY29uc3RydWN0b3IiICYmIHJlc3VsdCA9PT0gcCk7CisKKyAgICBnZXQgPSBbXTsKKyAgICBy ZXN1bHQgPSBSZWdFeHAocCwgIiIpOworICAgIC8vIE9kZGx5LCB5b3UgY2FuIHRlbGwgaWYgeW91 IGhhdmUgYSBwcm94eSBoZXJlIHNpbmNlIGl0IHdpbGwgbG9va3VwIHRoZSBzb3VyY2UgcHJvcGVy dHksIHdoaWNoIGRvZXNuJ3QgaGFwcGVuIG9uIGEgUmVnRXhwIG9iamVjdC4KKyAgICBhc3NlcnQo Z2V0WzBdID09PSBTeW1ib2wubWF0Y2ggJiYgZ2V0LnNsaWNlKDEpICsgJycgPT09ICJzb3VyY2Ui ICYmIHJlc3VsdCAhPT0gcCk7CisKKyAgICBnZXQgPSBbXTsKKyAgICBwID0gbmV3IFByb3h5KG5l dyBCb29sZWFuKHRydWUpLCB7IGdldDogZnVuY3Rpb24obywgaykgeyBnZXQucHVzaChrKTsgcmV0 dXJuIG9ba107IH19KTsKKyAgICBCb29sZWFuLnByb3RvdHlwZVtTeW1ib2wubWF0Y2hdID0gUmVn RXhwLnByb3RvdHlwZVtTeW1ib2wubWF0Y2hdOworICAgIEJvb2xlYW4ucHJvdG90eXBlLnNvdXJj ZSA9ICJmYWxzZSI7CisgICAgcmVzdWx0ID0gUmVnRXhwKHApOworICAgIGFzc2VydChnZXRbMF0g PT09IFN5bWJvbC5tYXRjaCAmJiBnZXQuc2xpY2UoMSkgKyAnJyA9PT0gImNvbnN0cnVjdG9yLHNv dXJjZSxmbGFncyIpOworICAgIGFzc2VydCghInRydWUiLm1hdGNoKHJlc3VsdCkpOworfQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IGEzMzNkODc2NTEzNzIyZWE0ODZkNDM2ZWY2YzVhODExNmMzZTc2YzYuLjhhMzAyMzBlMzVh ZDM1NjNkMzZhMDg1ZmY4MjRhZTU0Y2YwMWJmYWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAx Ni0wMy0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZWdFeHAgY29uc3RydWN0b3Igc2hvdWxkIHVzZSBTeW1ib2wubWF0Y2ggYW5kIG90aGVyIHBy b3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1NTg3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeCB0ZXN0IGZvciBuZXcgYmVoYXZpb3IuCisKKyAgICAgICAgKiBmYXN0L3JlZ2V4L2NvbnN0 cnVjdG9yLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9j b25zdHJ1Y3Rvci5qczoKKwogMjAxNi0wMy0yNCAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxl LmNvbT4KIAogICAgICAgICBFUzY6IEltcGxlbWVudCBJc1JlZ0V4cCBmdW5jdGlvbiBhbmQgdXNl IHdoZXJlIG5lZWRlZCBpbiBTdHJpbmcucHJvdG90eXBlLiogbWV0aG9kcwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9yZWdleC9jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2V4L2NvbnN0cnVjdG9yLWV4cGVjdGVkLnR4dAppbmRleCA0MTJkMzIxMGZh ZGRhZjA3YTI2OGI3MmFjYTVkMTYyODg1Y2FkODM0Li5jZjc5M2MxOTZkNjM4NjRlZTM4ODlmMmM1 MTY1YWM1MjE1NGFlODg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L2NvbnN0 cnVjdG9yLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L2NvbnN0cnVj dG9yLWV4cGVjdGVkLnR4dApAQCAtNSw3ICs1LDcgQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2Vl IGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUK IAogUEFTUyByZSA9PT0gUmVnRXhwKHJlKSBpcyB0cnVlCiBQQVNTIHJlICE9PSBuZXcgUmVnRXhw KHJlKSBpcyB0cnVlCi1QQVNTIHJlID09PSBSZWdFeHAocmUsJ2knKSBpcyB0cnVlCitQQVNTIHJl ICE9PSBSZWdFeHAocmUsJ2knKSBpcyB0cnVlCiBQQVNTIHJlICE9PSBuZXcgUmVnRXhwKHJlLCdp JykgaXMgdHJ1ZQogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9jb25zdHJ1Y3Rvci5qcyBiL0xh eW91dFRlc3RzL2Zhc3QvcmVnZXgvc2NyaXB0LXRlc3RzL2NvbnN0cnVjdG9yLmpzCmluZGV4IDZk YTEwMWM5NDc4MjAyZWEwZDBkNTVjYjVlOWZiOTVlYjY3YWU3ZjMuLjEzNzhhZGFlOWI4ZjlhNjg3 NTJmZjNmODdiOTQ0YjFiNzhiNzFlNmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvcmVn ZXgvc2NyaXB0LXRlc3RzL2NvbnN0cnVjdG9yLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVn ZXgvc2NyaXB0LXRlc3RzL2NvbnN0cnVjdG9yLmpzCkBAIC00LDYgKzQsNiBAQCB2YXIgcmUgPSAv YWJjLzsKIAogc2hvdWxkQmVUcnVlKCJyZSA9PT0gUmVnRXhwKHJlKSIpOwogc2hvdWxkQmVUcnVl KCJyZSAhPT0gbmV3IFJlZ0V4cChyZSkiKTsKLXNob3VsZEJlVHJ1ZSgicmUgPT09IFJlZ0V4cChy ZSwnaScpIik7CitzaG91bGRCZVRydWUoInJlICE9PSBSZWdFeHAocmUsJ2knKSIpOwogc2hvdWxk QmVUcnVlKCJyZSAhPT0gbmV3IFJlZ0V4cChyZSwnaScpIik7CiAK 275594 2016-04-04 16:59:21 -0700 2016-04-06 10:26:39 -0700 Patch for landing bug-155873-20160404165931.patch text/plain 16734 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YWZlNjBmY2MwZTZmODJhZjk2ZDRmNTc5ZDQ1ZGU4OTg2ZTAzMTJkLi4zZDNhYjBlZTYxMWI0NzAy MGRiZDkxNWQxYWZkYmI3ZDI0ZGE3NGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNi0wMy0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBSZWdFeHAgY29uc3RydWN0b3Igc2hvdWxkIHVzZSBTeW1ib2wubWF0 Y2ggYW5kIG90aGVyIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NTg3MworCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fi b2ZmLgorCisgICAgICAgIFRoaXMgcGF0Y2ggdXBkYXRlcyB0aGUgYmVoYXZpb3Igb2YgdGhlIFJl Z0V4cCBjb25zdHJ1Y3Rvci4gTm93IHRoZSBjb25zdHJ1Y3RvcgorICAgICAgICBzaG91bGQgZ2V0 IHRoZSBTeW1ib2wubWF0Y2ggcHJvcGVydHkgYW5kIGNoZWNrIGlmIGl0IGV4aXN0cyB0byBkZWNp ZGUgaWYgc29tZXRoaW5nCisgICAgICAgIHNob3VsZCBiZSBjb25zdHJ1Y3RlZCBsaWtlIGEgcmVn ZXhwIG9iamVjdC4KKworICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuY3BwOgor ICAgICAgICAoSlNDOjp0b0ZsYWdzKToKKyAgICAgICAgKEpTQzo6Y29uc3RydWN0UmVnRXhwKToK KyAgICAgICAgKEpTQzo6Y29uc3RydWN0V2l0aFJlZ0V4cENvbnN0cnVjdG9yKToKKyAgICAgICAg KEpTQzo6Y2FsbFJlZ0V4cENvbnN0cnVjdG9yKToKKyAgICAgICAgKiBydW50aW1lL1JlZ0V4cENv bnN0cnVjdG9yLmg6CisgICAgICAgICogdGVzdHMvc3RyZXNzL3JlZ2V4cC1jb25zdHJ1Y3Rvci5q czogQWRkZWQuCisgICAgICAgIChhc3NlcnQpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yLmdl dCBsZXQpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yLik6CisgICAgICAgICh0aHJvdy5uZXcu RXJyb3IuZ2V0IHJlKToKKwogMjAxNi0wMy0yNCAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxl LmNvbT4KIAogICAgICAgICBFUzY6IEltcGxlbWVudCBJc1JlZ0V4cCBmdW5jdGlvbiBhbmQgdXNl IHdoZXJlIG5lZWRlZCBpbiBTdHJpbmcucHJvdG90eXBlLiogbWV0aG9kcwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29uIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29uCmluZGV4IGVlNDlhNDMz MGU4MzAyNTg5YzQ3Nzk2Y2M2NjY2ODU0ZGJiMTM2MzIuLjZmZjhhM2NlNjM5MDRkNTNmZjhhNmJm NTA0OGVkNmFlMjUyYjU0NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9CeXRlY29kZUxpc3QuanNvbgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvQnl0ZWNvZGVMaXN0Lmpzb24KQEAgLTU3LDYgKzU3LDcgQEAKICAgICAgICAgICAgIHsgIm5h bWUiIDogIm9wX2lzX29iamVjdF9vcl9udWxsIiwgImxlbmd0aCIgOiAzIH0sCiAgICAgICAgICAg ICB7ICJuYW1lIiA6ICJvcF9pc19mdW5jdGlvbiIsICJsZW5ndGgiIDogMyB9LAogICAgICAgICAg ICAgeyAibmFtZSIgOiAib3BfaW4iLCAibGVuZ3RoIiA6IDQgfSwKKyAgICAgICAgICAgIHsgIm5h bWUiIDogIm9wX2lzX3B1cmVseV9lcXVpdmFsZW50IiA6IDUgfQogICAgICAgICAgICAgeyAibmFt ZSIgOiAib3BfZ2V0X2J5X2lkIiwgImxlbmd0aCIgOiA5ICB9LAogICAgICAgICAgICAgeyAibmFt ZSIgOiAib3BfZ2V0X2FycmF5X2xlbmd0aCIsICJsZW5ndGgiIDogOSB9LAogICAgICAgICAgICAg eyAibmFtZSIgOiAib3BfcHV0X2J5X2lkIiwgImxlbmd0aCIgOiA5IH0sCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVVc2VEZWYuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9CeXRlY29kZVVzZURlZi5oCmluZGV4IDUzODBiNDNmYWM5 MzNlNjBmMGVhZTE2YzZjMzY2YjE1YjdjNWE5YzQuLjQxNzgwNWY4YmRlNTY1OWVkZWUyM2I0ZTY2 NjkwNzc0MmUyNTg0YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9CeXRlY29kZVVzZURlZi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9C eXRlY29kZVVzZURlZi5oCkBAIC0xMzEsNiArMTMxLDEyIEBAIHZvaWQgY29tcHV0ZVVzZXNGb3JC eXRlY29kZU9mZnNldCgKICAgICAgICAgZnVuY3Rvcihjb2RlQmxvY2ssIGluc3RydWN0aW9uLCBv cGNvZGVJRCwgaW5zdHJ1Y3Rpb25bNF0udS5vcGVyYW5kKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KKyAgICBjYXNlIG9wX2lzX3B1cmVseV9lcXVpdmFsZW50OiB7CisgICAgICAgIEFTU0VSVChv cGNvZGVMZW5ndGhzW29wY29kZUlEXSA+IDQpOworICAgICAgICBmdW5jdG9yKGNvZGVCbG9jaywg aW5zdHJ1Y3Rpb24sIG9wY29kZUlELCBpbnN0cnVjdGlvblsyXS51Lm9wZXJhbmQpOworICAgICAg ICBmdW5jdG9yKGNvZGVCbG9jaywgaW5zdHJ1Y3Rpb24sIG9wY29kZUlELCBpbnN0cnVjdGlvbls0 XS51Lm9wZXJhbmQpOworICAgICAgICByZXR1cm47CisgICAgfQogICAgIGNhc2Ugb3BfZ2V0X3By b3BlcnR5X2VudW1lcmF0b3I6CiAgICAgY2FzZSBvcF9nZXRfZW51bWVyYWJsZV9sZW5ndGg6CiAg ICAgY2FzZSBvcF9uZXdfZnVuY19leHA6CkBAIC0zNjMsNiArMzY5LDcgQEAgdm9pZCBjb21wdXRl RGVmc0ZvckJ5dGVjb2RlT2Zmc2V0KENvZGVCbG9jayogY29kZUJsb2NrLCBCeXRlY29kZUJhc2lj QmxvY2sqIGJsb2MKICAgICBjYXNlIG9wX3RhaWxfY2FsbDoKICAgICBjYXNlIG9wX2NhbGxfZXZh bDoKICAgICBjYXNlIG9wX2NvbnN0cnVjdDoKKyAgICBjYXNlIG9wX2lzX3B1cmVseV9lcXVpdmFs ZW50OgogICAgIGNhc2Ugb3BfZ2V0X2J5X2lkOgogICAgIGNhc2Ugb3BfZ2V0X2FycmF5X2xlbmd0 aDoKICAgICBjYXNlIG9wX292ZXJyaWRlc19oYXNfaW5zdGFuY2U6CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IGZmMzc4NDM2OWE5ZGMxNTYxYzY3 MjBlOGUxZGMzYjYyNWMzMTYzNWUuLmY0NDg4NjFkMjQxYjIzMDgyNDZiMTY2NzIwZGFiZjQxM2E0 OGQ5NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3Bw CkBAIC0xMDk1LDYgKzEwOTUsMTQgQEAgdm9pZCBDb2RlQmxvY2s6OmR1bXBCeXRlY29kZSgKICAg ICAgICAgICAgIHByaW50QmluYXJ5T3Aob3V0LCBleGVjLCBsb2NhdGlvbiwgaXQsICJpbiIpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBvcF9pc19wdXJlbHlf ZXF1aXZhbGVudDogeworICAgICAgICAgICAgaW50IHJlc3VsdCA9ICgrK2l0KS0+dS5vcGVyYW5k OworICAgICAgICAgICAgaW50IGJhc2UgPSAoKytpdCktPnUub3BlcmFuZDsKKyAgICAgICAgICAg IGludCBpbmRlbnQgPSAoKytpdCktPnUub3BlcmFuZDsKKyAgICAgICAgICAgIGludCBleHBlY3Rl ZCA9ICgrK2l0KS0+dS5vcGVyYW5kOworICAgICAgICAgICAgcHJpbnRMb2NhdGlvbkFuZE9wKG91 dCwgZXhlYywgbG9jYXRpb24sIGl0LCAiaXNfcHVyZWx5X2VxdWl2YWxlbnQiKTsKKyAgICAgICAg ICAgIG91dC5wcmludGYoIiVzLCAlcywgJXMsICVzIiwgcmVnaXN0ZXJOYW1lKHJlc3VsdCkuZGF0 YSgpLCByZWdpc3Rlck5hbWUoYmFzZSkuZGF0YSgpLCBpZE5hbWUoaWRlbnQsIGlkZW50aWZpZXIo aWRlbnQpKS5kYXRhKCksIHJlZ2lzdGVyTmFtZShleHBlY3RlZCkuZGF0YSgpKTsKKyAgICAgICAg fQogICAgICAgICBjYXNlIG9wX2dldF9ieV9pZDoKICAgICAgICAgY2FzZSBvcF9nZXRfYXJyYXlf bGVuZ3RoOiB7CiAgICAgICAgICAgICBwcmludEdldEJ5SWRPcChvdXQsIGV4ZWMsIGxvY2F0aW9u LCBpdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93 UGF0aHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNw cAppbmRleCA3MDk3ZjMxZDFmNDg5Njk2MWM3MzJlODJiMDM1MjcwMDQzYTE2YjNiLi40NDNlOTdi NzlhZmUwODMxYmI4Zjg2N2JhNTk0MDU1NzZkOWQ3ZWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAKQEAgLTU0NCw2ICs1NDQsMjYgQEAgTExJ TlRfU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX2luc3RhbmNlb2ZfY3VzdG9tKQogICAgIExMSU5U X1JFVFVSTihyZXN1bHQpOwogfQogCitMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfaXNf cHVyZWx5X2VxdWl2YWxlbnQpCit7CisgICAgTExJTlRfQkVHSU4oKTsKKyAgICBDb2RlQmxvY2sq IGNvZGVCbG9jayA9IGV4ZWMtPmNvZGVCbG9jaygpOworICAgIGNvbnN0IElkZW50aWZpZXImIGlk ZW50ID0gY29kZUJsb2NrLT5pZGVudGlmaWVyKHBjWzNdLnUub3BlcmFuZCk7CisgICAgSlNWYWx1 ZSBiYXNlVmFsdWUgPSBMTElOVF9PUF9DKDIpLmpzVmFsdWUoKTsKKyAgICBKU1ZhbHVlIGV4cGVj dGVkID0gTExJTlRfT1BfQyg0KS5qc1ZhbHVlKCk7CisgICAgUHJvcGVydHlTbG90IHNsb3QoYmFz ZVZhbHVlLCBQcm9wZXJ0eVNsb3Q6OlByb3BlcnR5U2xvdDo6SW50ZXJuYWxNZXRob2RUeXBlOjpW TUlucXVpcnkpOworICAgIEpTVmFsdWUgcmVzdWx0OworCisgICAgaWYgKHNsb3cuaXNUYWludGVk QnlQcm94eSgpKQorICAgICAgICByZXN1bHQgPSBqc0Jvb2xlYW4oZmFsc2UpOworICAgIGVsc2Ug aWYgKHNsb3QuaXNWYWx1ZSgpKQorICAgICAgICByZXN1bHQgPSBqc0Jvb2xlYW4oc2xvdC5nZXRW YWx1ZShleGVjLCBpZGVudCkgPT0gZXhwZWN0ZWQpOworICAgIGVsc2UKKyAgICAgICAgcmVzdWx0 ID0ganNCb29sZWFuKGZhbHNlKTsKKworICAgIExMSU5UX1JFVFVSTihyZXN1bHQpOworfQorCiBM TElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfZ2V0X2J5X2lkKQogewogICAgIExMSU5UX0JF R0lOKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJ bnRlcnByZXRlci5hc20gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRl cnByZXRlci5hc20KaW5kZXggNWRhMzc3Yjk5MDg3ZTZkMDdjZTIyZDU2OGEwNGMzY2EzZWY5YzUx NS4uY2NjMzIwNWI2NDNmMmQyOTVmYThjNmIyYzExOTAzYjBiY2ViYmNhOSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQpAQCAt MTMwMSw2ICsxMzAxLDEyIEBAIF9sbGludF9vcF9pbjoKICAgICBkaXNwYXRjaCg0KQogCiAKK19s bGludF9vcF9pc19wdXJlbHlfZXF1aXZhbGVudDoKKyAgICB0cmFjZUV4ZWN1dGlvbigpCisgICAg Y2FsbFNsb3dQYXRoKF9sbGludF9zbG93X3BhdGhfb3BfaXNfcHVyZWx5X2VxdWl2YWxlbnQpCisg ICAgZGlzcGF0Y2goNSkKKworCiBfbGxpbnRfb3BfZGVsX2J5X2lkOgogICAgIHRyYWNlRXhlY3V0 aW9uKCkKICAgICBjYWxsU2xvd1BhdGgoX2xsaW50X3Nsb3dfcGF0aF9kZWxfYnlfaWQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rvci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rvci5jcHAK aW5kZXggNzU5ZWRhMDZhNmVhYjM2OTc1YWY1NWUwY2U1ZjM5MzJhMWE1YTgxOC4uNWRhNDAzMGVi YTc0MDM0ZTYyMjI2MjE5MWNiMWEyNGFhMGQwMDRiYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cENvbnN0cnVjdG9yLmNwcApAQCAtOTYsNyArOTYsNiBA QCB2b2lkIFJlZ0V4cENvbnN0cnVjdG9yOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFJlZ0V4cFBy b3RvdHlwZSogcmVnRXhwUHJvdG90eXBlLAogICAgIEJhc2U6OmZpbmlzaENyZWF0aW9uKHZtLCBB U0NJSUxpdGVyYWwoIlJlZ0V4cCIpKTsKICAgICBBU1NFUlQoaW5oZXJpdHMoaW5mbygpKSk7CiAK LSAgICAvLyBFQ01BIDE1LjEwLjUuMSBSZWdFeHAucHJvdG90eXBlCiAgICAgcHV0RGlyZWN0V2l0 aG91dFRyYW5zaXRpb24odm0sIHZtLnByb3BlcnR5TmFtZXMtPnByb3RvdHlwZSwgcmVnRXhwUHJv dG90eXBlLCBEb250RW51bSB8IERvbnREZWxldGUgfCBSZWFkT25seSk7CiAKICAgICAvLyBuby4g b2YgYXJndW1lbnRzIGZvciBjb25zdHJ1Y3RvcgpAQCAtMjYwLDQ2ICsyNTksNzMgQEAgaW5saW5l IFN0cnVjdHVyZSogZ2V0UmVnRXhwU3RydWN0dXJlKEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamUKICAgICByZXR1cm4gc3RydWN0dXJlOwogfQogCi0vLyBFQ01BIDE1 LjEwLjQKLUpTT2JqZWN0KiBjb25zdHJ1Y3RSZWdFeHAoRXhlY1N0YXRlKiBleGVjLCBKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2JqZWN0LCBjb25zdCBBcmdMaXN0JiBhcmdzLCBKU1ZhbHVlIG5ld1Rh cmdldCkKK2lubGluZSBSZWdFeHBGbGFncyB0b0ZsYWdzKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1 ZSBmbGFncykKIHsKLSAgICBKU1ZhbHVlIGFyZzAgPSBhcmdzLmF0KDApOwotICAgIEpTVmFsdWUg YXJnMSA9IGFyZ3MuYXQoMSk7CisgICAgaWYgKGZsYWdzLmlzVW5kZWZpbmVkKCkpCisgICAgICAg IHJldHVybiBOb0ZsYWdzOworICAgIEpTU3RyaW5nKiBmbGFnc1N0cmluZyA9IGZsYWdzLnRvU3Ry aW5nKGV4ZWMpOworICAgIGlmICghZmxhZ3NTdHJpbmcpIHsKKyAgICAgICAgQVNTRVJUKGV4ZWMt PmhhZEV4Y2VwdGlvbigpKTsKKyAgICAgICAgcmV0dXJuIEludmFsaWRGbGFnczsKKyAgICB9CisK KyAgICBSZWdFeHBGbGFncyByZXN1bHQgPSByZWdFeHBGbGFncyhmbGFnc1N0cmluZy0+dmFsdWUo ZXhlYykpOworICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKKyAgICAgICAgcmV0dXJuIElu dmFsaWRGbGFnczsKKyAgICBpZiAocmVzdWx0ID09IEludmFsaWRGbGFncykKKyAgICAgICAgdGhy b3dTeW50YXhFcnJvcihleGVjLCBBU0NJSUxpdGVyYWwoIkludmFsaWQgZmxhZ3Mgc3VwcGxpZWQg dG8gUmVnRXhwIGNvbnN0cnVjdG9yLiIpKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQogCitKU09i amVjdCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCwgY29uc3QgQXJnTGlzdCYgYXJncywgIEpTT2JqZWN0KiBjYWxsZWUsIEpTVmFs dWUgbmV3VGFyZ2V0KQorewogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7Ci0gICAgUmVnRXhwRmxh Z3MgZmxhZ3MgPSBOb0ZsYWdzOwotICAgIGJvb2wgaGF2ZUZsYWdzID0gZmFsc2U7Ci0gICAgaWYg KCFhcmcxLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgZmxhZ3MgPSByZWdFeHBGbGFncyhhcmcx LnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSk7CisgICAgSlNWYWx1ZSBwYXR0ZXJuQXJnID0g YXJncy5hdCgwKTsKKyAgICBKU1ZhbHVlIGZsYWdzQXJnID0gYXJncy5hdCgxKTsKKworICAgIGJv b2wgaXNQYXR0ZXJuUmVnRXhwID0gcGF0dGVybkFyZy5pbmhlcml0cyhSZWdFeHBPYmplY3Q6Omlu Zm8oKSk7CisgICAgYm9vbCBjb25zdHJ1Y3RBc1JlZ2V4cCA9IGlzUmVnRXhwKHZtLCBleGVjLCBw YXR0ZXJuQXJnKTsKKworICAgIGlmIChuZXdUYXJnZXQuaXNVbmRlZmluZWQoKSAmJiBjb25zdHJ1 Y3RBc1JlZ2V4cCAmJiBmbGFnc0FyZy5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgIEpTVmFsdWUg Y29uc3RydWN0b3IgPSBwYXR0ZXJuQXJnLmdldChleGVjLCB2bS5wcm9wZXJ0eU5hbWVzLT5jb25z dHJ1Y3Rvcik7CiAgICAgICAgIGlmICh2bS5leGNlcHRpb24oKSkKLSAgICAgICAgICAgIHJldHVy biAwOwotICAgICAgICBpZiAoZmxhZ3MgPT0gSW52YWxpZEZsYWdzKQotICAgICAgICAgICAgcmV0 dXJuIHZtLnRocm93RXhjZXB0aW9uKGV4ZWMsIGNyZWF0ZVN5bnRheEVycm9yKGV4ZWMsIEFTQ0lJ TGl0ZXJhbCgiSW52YWxpZCBmbGFncyBzdXBwbGllZCB0byBSZWdFeHAgY29uc3RydWN0b3IuIikp KTsKLSAgICAgICAgaGF2ZUZsYWdzID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBudWxscHRy OworICAgICAgICBpZiAoY2FsbGVlID09IGNvbnN0cnVjdG9yKSB7CisgICAgICAgICAgICAvLyBX ZSBrbm93IHRoYXQgcGF0dGVybkFyZyBpcyBhIG9iamVjdCBvdGhlcndpc2UgY29uc3RydWN0QXNS ZWdleHAgd291bGQgYmUgZmFsc2UuCisgICAgICAgICAgICByZXR1cm4gcGF0dGVybkFyZy5nZXRP YmplY3QoKTsKKyAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChhcmcwLmluaGVyaXRzKFJlZ0V4 cE9iamVjdDo6aW5mbygpKSkgewotICAgICAgICAvLyBJZiBjYWxsZWQgYXMgYSBmdW5jdGlvbiwg dGhpcyBqdXN0IHJldHVybnMgdGhlIGZpcnN0IGFyZ3VtZW50IChzZWUgMTUuMTAuMy4xKS4KLSAg ICAgICAgaWYgKG5ld1RhcmdldCAhPSBqc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgICAgICBSZWdF eHAqIHJlZ0V4cCA9IHN0YXRpY19jYXN0PFJlZ0V4cE9iamVjdCo+KGFzT2JqZWN0KGFyZzApKS0+ cmVnRXhwKCk7Ci0gICAgICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGdldFJlZ0V4cFN0 cnVjdHVyZShleGVjLCBnbG9iYWxPYmplY3QsIG5ld1RhcmdldCk7Ci0gICAgICAgICAgICBpZiAo dm0uZXhjZXB0aW9uKCkpCisgICAgaWYgKGlzUGF0dGVyblJlZ0V4cCkgeworICAgICAgICBSZWdF eHAqIHJlZ0V4cCA9IGpzQ2FzdDxSZWdFeHBPYmplY3QqPihwYXR0ZXJuQXJnKS0+cmVnRXhwKCk7 CisgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gZ2V0UmVnRXhwU3RydWN0dXJlKGV4ZWMs IGdsb2JhbE9iamVjdCwgbmV3VGFyZ2V0KTsKKyAgICAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlv bigpKQorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAgICAgaWYgKCFmbGFnc0Fy Zy5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgICAgICBSZWdFeHBGbGFncyBmbGFncyA9IHRvRmxh Z3MoZXhlYywgZmxhZ3NBcmcpOworICAgICAgICAgICAgaWYgKGZsYWdzID09IEludmFsaWRGbGFn cykKICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJlZ0V4cCA9 IFJlZ0V4cDo6Y3JlYXRlKHZtLCByZWdFeHAtPnBhdHRlcm4oKSwgZmxhZ3MpOworICAgICAgICB9 CiAKLSAgICAgICAgICAgIGlmIChoYXZlRmxhZ3MpIHsKLSAgICAgICAgICAgICAgICByZWdFeHAg PSBSZWdFeHA6OmNyZWF0ZSh2bSwgcmVnRXhwLT5wYXR0ZXJuKCksIGZsYWdzKTsKLSAgICAgICAg ICAgICAgICBpZiAodm0uZXhjZXB0aW9uKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBu dWxscHRyOwotICAgICAgICAgICAgfQorICAgICAgICByZXR1cm4gUmVnRXhwT2JqZWN0OjpjcmVh dGUoZXhlYy0+dm0oKSwgc3RydWN0dXJlLCByZWdFeHApOworICAgIH0KIAotICAgICAgICAgICAg cmV0dXJuIFJlZ0V4cE9iamVjdDo6Y3JlYXRlKHZtLCBzdHJ1Y3R1cmUsIHJlZ0V4cCk7Ci0gICAg ICAgIH0KLSAgICAgICAgcmV0dXJuIGFzT2JqZWN0KGFyZzApOworICAgIGlmIChjb25zdHJ1Y3RB c1JlZ2V4cCkgeworICAgICAgICBKU1ZhbHVlIHBhdHRlcm4gPSBwYXR0ZXJuQXJnLmdldChleGVj LCB2bS5wcm9wZXJ0eU5hbWVzLT5zb3VyY2UpOworICAgICAgICBpZiAoZmxhZ3NBcmcuaXNVbmRl ZmluZWQoKSkKKyAgICAgICAgICAgIGZsYWdzQXJnID0gcGF0dGVybkFyZy5nZXQoZXhlYywgdm0u cHJvcGVydHlOYW1lcy0+ZmxhZ3MpOworICAgICAgICBwYXR0ZXJuQXJnID0gcGF0dGVybjsKICAg ICB9CiAKLSAgICBTdHJpbmcgcGF0dGVybiA9IGFyZzAuaXNVbmRlZmluZWQoKSA/IGVtcHR5U3Ry aW5nKCkgOiBhcmcwLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKTsKLSAgICBpZiAodm0uZXhj ZXB0aW9uKCkpCi0gICAgICAgIHJldHVybiAwOworICAgIFN0cmluZyBwYXR0ZXJuID0gcGF0dGVy bkFyZy5pc1VuZGVmaW5lZCgpID8gZW1wdHlTdHJpbmcoKSA6IHBhdHRlcm5BcmcudG9TdHJpbmco ZXhlYyktPnZhbHVlKGV4ZWMpOworICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBSZWdFeHBGbGFncyBmbGFncyA9IHRvRmxhZ3MoZXhl YywgZmxhZ3NBcmcpOworICAgIGlmIChmbGFncyA9PSBJbnZhbGlkRmxhZ3MpCisgICAgICAgIHJl dHVybiBudWxscHRyOwogCiAgICAgUmVnRXhwKiByZWdFeHAgPSBSZWdFeHA6OmNyZWF0ZSh2bSwg cGF0dGVybiwgZmxhZ3MpOwogICAgIGlmICghcmVnRXhwLT5pc1ZhbGlkKCkpCkBAIC0zMTQsNyAr MzQwLDcgQEAgSlNPYmplY3QqIGNvbnN0cnVjdFJlZ0V4cChFeGVjU3RhdGUqIGV4ZWMsIEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIGNvbnN0IEEKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGNvbnN0cnVjdFdpdGhSZWdFeHBDb25zdHJ1Y3RvcihFeGVjU3RhdGUqIGV4 ZWMpCiB7CiAgICAgQXJnTGlzdCBhcmdzKGV4ZWMpOwotICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5jYWxsZWUo KSktPmdsb2JhbE9iamVjdCgpLCBhcmdzLCBleGVjLT5uZXdUYXJnZXQoKSkpOworICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50ZXJuYWxGdW5jdGlv bihleGVjLT5jYWxsZWUoKSktPmdsb2JhbE9iamVjdCgpLCBhcmdzLCBleGVjLT5jYWxsZWUoKSwg ZXhlYy0+bmV3VGFyZ2V0KCkpKTsKIH0KIAogQ29uc3RydWN0VHlwZSBSZWdFeHBDb25zdHJ1Y3Rv cjo6Z2V0Q29uc3RydWN0RGF0YShKU0NlbGwqLCBDb25zdHJ1Y3REYXRhJiBjb25zdHJ1Y3REYXRh KQpAQCAtMzIzLDExICszNDksMTAgQEAgQ29uc3RydWN0VHlwZSBSZWdFeHBDb25zdHJ1Y3Rvcjo6 Z2V0Q29uc3RydWN0RGF0YShKU0NlbGwqLCBDb25zdHJ1Y3REYXRhJiBjb25zdHIKICAgICByZXR1 cm4gQ29uc3RydWN0VHlwZTo6SG9zdDsKIH0KIAotLy8gRUNNQSAxNS4xMC4zCiBzdGF0aWMgRW5j b2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjYWxsUmVnRXhwQ29uc3RydWN0b3IoRXhlY1N0YXRl KiBleGVjKQogewogICAgIEFyZ0xpc3QgYXJncyhleGVjKTsKLSAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGNvbnN0cnVjdFJlZ0V4cChleGVjLCBhc0ludGVybmFsRnVuY3Rpb24oZXhlYy0+Y2Fs bGVlKCkpLT5nbG9iYWxPYmplY3QoKSwgYXJncykpOworICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5jYWxsZWUo KSktPmdsb2JhbE9iamVjdCgpLCBhcmdzLCBleGVjLT5jYWxsZWUoKSkpOwogfQogCiBDYWxsVHlw ZSBSZWdFeHBDb25zdHJ1Y3Rvcjo6Z2V0Q2FsbERhdGEoSlNDZWxsKiwgQ2FsbERhdGEmIGNhbGxE YXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29u c3RydWN0b3IuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cENvbnN0cnVj dG9yLmgKaW5kZXggMmUwYTFkNjNlZGEyY2Q5OTRjMWQxOGI4MDUyYjIyODZiZjkyOGQ5Mi4uN2Y0 NjZjYWM4ODZiNjFhZGUxOGM4MTYzMDJiYzIyNDhmNzM5OTEzNyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rvci5oCkBAIC04NSw3ICs4NSw3 IEBAIHByaXZhdGU6CiAKIFJlZ0V4cENvbnN0cnVjdG9yKiBhc1JlZ0V4cENvbnN0cnVjdG9yKEpT VmFsdWUpOwogCi1KU09iamVjdCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSosIEpTR2xvYmFs T2JqZWN0KiwgY29uc3QgQXJnTGlzdCYsIEpTVmFsdWUgbmV3VGFyZ2V0ID0ganNVbmRlZmluZWQo KSk7CitKU09iamVjdCogY29uc3RydWN0UmVnRXhwKEV4ZWNTdGF0ZSosIEpTR2xvYmFsT2JqZWN0 KiwgY29uc3QgQXJnTGlzdCYsIEpTT2JqZWN0KiBjYWxsZWUgPSBudWxscHRyLCBKU1ZhbHVlIG5l d1RhcmdldCA9IGpzVW5kZWZpbmVkKCkpOwogCiBpbmxpbmUgUmVnRXhwQ29uc3RydWN0b3IqIGFz UmVnRXhwQ29uc3RydWN0b3IoSlNWYWx1ZSB2YWx1ZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVnZXhwLWNvbnN0cnVjdG9yLmpzIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9yZWdleHAtY29uc3RydWN0b3IuanMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNjc2NDk0ODkyY2EyYWRhY2QxMDFiNjUwMWExYzVlZDc4YmQxZjBiZgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVnZXhwLWNvbnN0 cnVjdG9yLmpzCkBAIC0wLDAgKzEsNTEgQEAKK2Z1bmN0aW9uIGFzc2VydChjb25kaXRpb24pIHsK KyAgICBpZiAoIWNvbmRpdGlvbikKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJiYWQgYXNzZXJ0 aW9uIik7Cit9CisKK3sKKyAgICBsZXQgZ2V0ID0gW107CisgICAgbGV0IHJlID0geyBjb25zdHJ1 Y3RvcjogbnVsbCB9OworICAgIHJlW1N5bWJvbC5tYXRjaF0gPSB0cnVlOworICAgIGxldCBwID0g bmV3IFByb3h5KHJlLCB7IGdldDogZnVuY3Rpb24obywgaykgeyBnZXQucHVzaChrKTsgcmV0dXJu IG9ba107IH19KTsKKyAgICBSZWdFeHAocCk7CisgICAgYXNzZXJ0KGdldFswXSA9PT0gU3ltYm9s Lm1hdGNoICYmIGdldC5zbGljZSgxKSArICcnID09PSAiY29uc3RydWN0b3Isc291cmNlLGZsYWdz Iik7CisKKyAgICBnZXQgPSBbXTsKKyAgICBSZWdFeHAocCwgIiIpOworICAgIGFzc2VydChnZXRb MF0gPT09IFN5bWJvbC5tYXRjaCAmJiBnZXQuc2xpY2UoMSkgKyAnJyA9PT0gInNvdXJjZSIpOwor CisgICAgZ2V0ID0gW107CisgICAgcmUuY29uc3RydWN0b3IgPSBSZWdFeHA7CisgICAgbGV0IHJl c3VsdCA9IFJlZ0V4cChwKTsKKyAgICBhc3NlcnQoZ2V0WzBdID09PSBTeW1ib2wubWF0Y2ggJiYg Z2V0LnNsaWNlKDEpICsgJycgPT09ICJjb25zdHJ1Y3RvciIgJiYgcmVzdWx0ID09PSBwKTsKKwor ICAgIGdldCA9IFtdOworICAgIFJlZ0V4cChwLCAiIik7CisgICAgYXNzZXJ0KGdldFswXSA9PT0g U3ltYm9sLm1hdGNoICYmIGdldC5zbGljZSgxKSArICcnID09PSAic291cmNlIik7CisKKyAgICBn ZXQgPSBbXTsKKyAgICByZSA9IC9mb28vOworICAgIHAgPSBuZXcgUHJveHkocmUsIHsgZ2V0OiBm dW5jdGlvbihvLCBrKSB7IGdldC5wdXNoKGspOyByZXR1cm4gb1trXTsgfX0pOworICAgIFJlZ0V4 cChwKTsKKyAgICBhc3NlcnQoZ2V0WzBdID09PSBTeW1ib2wubWF0Y2ggJiYgZ2V0LnNsaWNlKDEp ICsgJycgPT09ICJjb25zdHJ1Y3RvciIpOworCisgICAgZ2V0ID0gW107CisgICAgcmUgPSAvZm9v LzsKKyAgICBwID0gbmV3IFByb3h5KHJlLCB7IGdldDogZnVuY3Rpb24obywgaykgeyBnZXQucHVz aChrKTsgcmV0dXJuIG9ba107IH19KTsKKyAgICByZXN1bHQgPSBSZWdFeHAocCk7CisgICAgYXNz ZXJ0KGdldFswXSA9PT0gU3ltYm9sLm1hdGNoICYmIGdldC5zbGljZSgxKSArICcnID09PSAiY29u c3RydWN0b3IiICYmIHJlc3VsdCA9PT0gcCk7CisKKyAgICBnZXQgPSBbXTsKKyAgICByZXN1bHQg PSBSZWdFeHAocCwgIiIpOworICAgIC8vIE9kZGx5LCB5b3UgY2FuIHRlbGwgaWYgeW91IGhhdmUg YSBwcm94eSBoZXJlIHNpbmNlIGl0IHdpbGwgbG9va3VwIHRoZSBzb3VyY2UgcHJvcGVydHksIHdo aWNoIGRvZXNuJ3QgaGFwcGVuIG9uIGEgUmVnRXhwIG9iamVjdC4KKyAgICBhc3NlcnQoZ2V0WzBd ID09PSBTeW1ib2wubWF0Y2ggJiYgZ2V0LnNsaWNlKDEpICsgJycgPT09ICJzb3VyY2UiICYmIHJl c3VsdCAhPT0gcCk7CisKKyAgICBnZXQgPSBbXTsKKyAgICBwID0gbmV3IFByb3h5KG5ldyBCb29s ZWFuKHRydWUpLCB7IGdldDogZnVuY3Rpb24obywgaykgeyBnZXQucHVzaChrKTsgcmV0dXJuIG9b a107IH19KTsKKyAgICBCb29sZWFuLnByb3RvdHlwZVtTeW1ib2wubWF0Y2hdID0gUmVnRXhwLnBy b3RvdHlwZVtTeW1ib2wubWF0Y2hdOworICAgIEJvb2xlYW4ucHJvdG90eXBlLnNvdXJjZSA9ICJm YWxzZSI7CisgICAgcmVzdWx0ID0gUmVnRXhwKHApOworICAgIGFzc2VydChnZXRbMF0gPT09IFN5 bWJvbC5tYXRjaCAmJiBnZXQuc2xpY2UoMSkgKyAnJyA9PT0gImNvbnN0cnVjdG9yLHNvdXJjZSxm bGFncyIpOworICAgIGFzc2VydCghInRydWUiLm1hdGNoKHJlc3VsdCkpOworfQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGEz MzNkODc2NTEzNzIyZWE0ODZkNDM2ZWY2YzVhODExNmMzZTc2YzYuLjllMjFkN2NjMTRkOTI2YWM3 NjM2ZTZlOGY1MjY1NGJmMTZmODRlNDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNi0wMy0y NCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZWdF eHAgY29uc3RydWN0b3Igc2hvdWxkIHVzZSBTeW1ib2wubWF0Y2ggYW5kIG90aGVyIHByb3BlcnRp ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTg3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2ZmLgorCisgICAgICAgIEZpeCB0 ZXN0IGZvciBuZXcgYmVoYXZpb3IuCisKKyAgICAgICAgKiBmYXN0L3JlZ2V4L2NvbnN0cnVjdG9y LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9jb25zdHJ1 Y3Rvci5qczoKKwogMjAxNi0wMy0yNCAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4K IAogICAgICAgICBFUzY6IEltcGxlbWVudCBJc1JlZ0V4cCBmdW5jdGlvbiBhbmQgdXNlIHdoZXJl IG5lZWRlZCBpbiBTdHJpbmcucHJvdG90eXBlLiogbWV0aG9kcwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9yZWdleC9jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L3JlZ2V4L2NvbnN0cnVjdG9yLWV4cGVjdGVkLnR4dAppbmRleCA0MTJkMzIxMGZhZGRhZjA3 YTI2OGI3MmFjYTVkMTYyODg1Y2FkODM0Li5jZjc5M2MxOTZkNjM4NjRlZTM4ODlmMmM1MTY1YWM1 MjE1NGFlODg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L2NvbnN0cnVjdG9y LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L2NvbnN0cnVjdG9yLWV4 cGVjdGVkLnR4dApAQCAtNSw3ICs1LDcgQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUKIAogUEFT UyByZSA9PT0gUmVnRXhwKHJlKSBpcyB0cnVlCiBQQVNTIHJlICE9PSBuZXcgUmVnRXhwKHJlKSBp cyB0cnVlCi1QQVNTIHJlID09PSBSZWdFeHAocmUsJ2knKSBpcyB0cnVlCitQQVNTIHJlICE9PSBS ZWdFeHAocmUsJ2knKSBpcyB0cnVlCiBQQVNTIHJlICE9PSBuZXcgUmVnRXhwKHJlLCdpJykgaXMg dHJ1ZQogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9jb25zdHJ1Y3Rvci5qcyBiL0xheW91dFRl c3RzL2Zhc3QvcmVnZXgvc2NyaXB0LXRlc3RzL2NvbnN0cnVjdG9yLmpzCmluZGV4IDZkYTEwMWM5 NDc4MjAyZWEwZDBkNTVjYjVlOWZiOTVlYjY3YWU3ZjMuLjEzNzhhZGFlOWI4ZjlhNjg3NTJmZjNm ODdiOTQ0YjFiNzhiNzFlNmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvcmVnZXgvc2Ny aXB0LXRlc3RzL2NvbnN0cnVjdG9yLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnZXgvc2Ny aXB0LXRlc3RzL2NvbnN0cnVjdG9yLmpzCkBAIC00LDYgKzQsNiBAQCB2YXIgcmUgPSAvYWJjLzsK IAogc2hvdWxkQmVUcnVlKCJyZSA9PT0gUmVnRXhwKHJlKSIpOwogc2hvdWxkQmVUcnVlKCJyZSAh PT0gbmV3IFJlZ0V4cChyZSkiKTsKLXNob3VsZEJlVHJ1ZSgicmUgPT09IFJlZ0V4cChyZSwnaScp Iik7CitzaG91bGRCZVRydWUoInJlICE9PSBSZWdFeHAocmUsJ2knKSIpOwogc2hvdWxkQmVUcnVl KCJyZSAhPT0gbmV3IFJlZ0V4cChyZSwnaScpIik7CiAK 275780 2016-04-06 10:26:42 -0700 2016-04-06 11:26:14 -0700 Patch for landing bug-155873-20160406102643.patch text/plain 9868 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy ZmVmMDk4M2M4ZTgxNDBjYjVjNGYyZmMwN2FhNTU5ODU1ZGJjYjI3Li45ZTA2YWMwZThlZGU1YWJj N2EwZWVlZjUwNWRkNDg2NjUzZDNkZDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNi0wMy0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBSZWdFeHAgY29uc3RydWN0b3Igc2hvdWxkIHVzZSBTeW1ib2wubWF0 Y2ggYW5kIG90aGVyIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NTg3MworCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fi b2ZmLgorCisgICAgICAgIFRoaXMgcGF0Y2ggdXBkYXRlcyB0aGUgYmVoYXZpb3Igb2YgdGhlIFJl Z0V4cCBjb25zdHJ1Y3Rvci4gTm93IHRoZSBjb25zdHJ1Y3RvcgorICAgICAgICBzaG91bGQgZ2V0 IHRoZSBTeW1ib2wubWF0Y2ggcHJvcGVydHkgYW5kIGNoZWNrIGlmIGl0IGV4aXN0cyB0byBkZWNp ZGUgaWYgc29tZXRoaW5nCisgICAgICAgIHNob3VsZCBiZSBjb25zdHJ1Y3RlZCBsaWtlIGEgcmVn ZXhwIG9iamVjdC4KKworICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuY3BwOgor ICAgICAgICAoSlNDOjp0b0ZsYWdzKToKKyAgICAgICAgKEpTQzo6Y29uc3RydWN0UmVnRXhwKToK KyAgICAgICAgKEpTQzo6Y29uc3RydWN0V2l0aFJlZ0V4cENvbnN0cnVjdG9yKToKKyAgICAgICAg KEpTQzo6Y2FsbFJlZ0V4cENvbnN0cnVjdG9yKToKKyAgICAgICAgKiBydW50aW1lL1JlZ0V4cENv bnN0cnVjdG9yLmg6CisgICAgICAgICogdGVzdHMvc3RyZXNzL3JlZ2V4cC1jb25zdHJ1Y3Rvci5q czogQWRkZWQuCisgICAgICAgIChhc3NlcnQpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yLmdl dCBsZXQpOgorICAgICAgICAodGhyb3cubmV3LkVycm9yLik6CisgICAgICAgICh0aHJvdy5uZXcu RXJyb3IuZ2V0IHJlKToKKwogMjAxNi0wNC0wNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBbRW5hYmxlZEF0UnVudGltZV0gb3BlcmF0 aW9ucyBvbiBET01XaW5kb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1JlZ0V4cENvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1JlZ0V4cENvbnN0cnVjdG9yLmNwcAppbmRleCA3NTllZGEwNmE2ZWFiMzY5NzVhZjU1ZTBjZTVm MzkzMmExYTVhODE4Li41ZGE0MDMwZWJhNzQwMzRlNjIyMjYyMTkxY2IxYTI0YWEwZDAwNGJjIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rv ci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0 b3IuY3BwCkBAIC05Niw3ICs5Niw2IEBAIHZvaWQgUmVnRXhwQ29uc3RydWN0b3I6OmZpbmlzaENy ZWF0aW9uKFZNJiB2bSwgUmVnRXhwUHJvdG90eXBlKiByZWdFeHBQcm90b3R5cGUsCiAgICAgQmFz ZTo6ZmluaXNoQ3JlYXRpb24odm0sIEFTQ0lJTGl0ZXJhbCgiUmVnRXhwIikpOwogICAgIEFTU0VS VChpbmhlcml0cyhpbmZvKCkpKTsKIAotICAgIC8vIEVDTUEgMTUuMTAuNS4xIFJlZ0V4cC5wcm90 b3R5cGUKICAgICBwdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwgdm0ucHJvcGVydHlOYW1l cy0+cHJvdG90eXBlLCByZWdFeHBQcm90b3R5cGUsIERvbnRFbnVtIHwgRG9udERlbGV0ZSB8IFJl YWRPbmx5KTsKIAogICAgIC8vIG5vLiBvZiBhcmd1bWVudHMgZm9yIGNvbnN0cnVjdG9yCkBAIC0y NjAsNDYgKzI1OSw3MyBAQCBpbmxpbmUgU3RydWN0dXJlKiBnZXRSZWdFeHBTdHJ1Y3R1cmUoRXhl Y1N0YXRlKiBleGVjLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZQogICAgIHJldHVybiBzdHJ1 Y3R1cmU7CiB9CiAKLS8vIEVDTUEgMTUuMTAuNAotSlNPYmplY3QqIGNvbnN0cnVjdFJlZ0V4cChF eGVjU3RhdGUqIGV4ZWMsIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIGNvbnN0IEFyZ0xp c3QmIGFyZ3MsIEpTVmFsdWUgbmV3VGFyZ2V0KQoraW5saW5lIFJlZ0V4cEZsYWdzIHRvRmxhZ3Mo RXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGZsYWdzKQogewotICAgIEpTVmFsdWUgYXJnMCA9IGFy Z3MuYXQoMCk7Ci0gICAgSlNWYWx1ZSBhcmcxID0gYXJncy5hdCgxKTsKKyAgICBpZiAoZmxhZ3Mu aXNVbmRlZmluZWQoKSkKKyAgICAgICAgcmV0dXJuIE5vRmxhZ3M7CisgICAgSlNTdHJpbmcqIGZs YWdzU3RyaW5nID0gZmxhZ3MudG9TdHJpbmcoZXhlYyk7CisgICAgaWYgKCFmbGFnc1N0cmluZykg eworICAgICAgICBBU1NFUlQoZXhlYy0+aGFkRXhjZXB0aW9uKCkpOworICAgICAgICByZXR1cm4g SW52YWxpZEZsYWdzOworICAgIH0KKworICAgIFJlZ0V4cEZsYWdzIHJlc3VsdCA9IHJlZ0V4cEZs YWdzKGZsYWdzU3RyaW5nLT52YWx1ZShleGVjKSk7CisgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlv bigpKQorICAgICAgICByZXR1cm4gSW52YWxpZEZsYWdzOworICAgIGlmIChyZXN1bHQgPT0gSW52 YWxpZEZsYWdzKQorICAgICAgICB0aHJvd1N5bnRheEVycm9yKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgi SW52YWxpZCBmbGFncyBzdXBwbGllZCB0byBSZWdFeHAgY29uc3RydWN0b3IuIikpOworICAgIHJl dHVybiByZXN1bHQ7Cit9CiAKK0pTT2JqZWN0KiBjb25zdHJ1Y3RSZWdFeHAoRXhlY1N0YXRlKiBl eGVjLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBjb25zdCBBcmdMaXN0JiBhcmdzLCAg SlNPYmplY3QqIGNhbGxlZSwgSlNWYWx1ZSBuZXdUYXJnZXQpCit7CiAgICAgVk0mIHZtID0gZXhl Yy0+dm0oKTsKLSAgICBSZWdFeHBGbGFncyBmbGFncyA9IE5vRmxhZ3M7Ci0gICAgYm9vbCBoYXZl RmxhZ3MgPSBmYWxzZTsKLSAgICBpZiAoIWFyZzEuaXNVbmRlZmluZWQoKSkgewotICAgICAgICBm bGFncyA9IHJlZ0V4cEZsYWdzKGFyZzEudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpKTsKKyAg ICBKU1ZhbHVlIHBhdHRlcm5BcmcgPSBhcmdzLmF0KDApOworICAgIEpTVmFsdWUgZmxhZ3NBcmcg PSBhcmdzLmF0KDEpOworCisgICAgYm9vbCBpc1BhdHRlcm5SZWdFeHAgPSBwYXR0ZXJuQXJnLmlu aGVyaXRzKFJlZ0V4cE9iamVjdDo6aW5mbygpKTsKKyAgICBib29sIGNvbnN0cnVjdEFzUmVnZXhw ID0gaXNSZWdFeHAodm0sIGV4ZWMsIHBhdHRlcm5BcmcpOworCisgICAgaWYgKG5ld1RhcmdldC5p c1VuZGVmaW5lZCgpICYmIGNvbnN0cnVjdEFzUmVnZXhwICYmIGZsYWdzQXJnLmlzVW5kZWZpbmVk KCkpIHsKKyAgICAgICAgSlNWYWx1ZSBjb25zdHJ1Y3RvciA9IHBhdHRlcm5BcmcuZ2V0KGV4ZWMs IHZtLnByb3BlcnR5TmFtZXMtPmNvbnN0cnVjdG9yKTsKICAgICAgICAgaWYgKHZtLmV4Y2VwdGlv bigpKQotICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgIGlmIChmbGFncyA9PSBJbnZhbGlk RmxhZ3MpCi0gICAgICAgICAgICByZXR1cm4gdm0udGhyb3dFeGNlcHRpb24oZXhlYywgY3JlYXRl U3ludGF4RXJyb3IoZXhlYywgQVNDSUlMaXRlcmFsKCJJbnZhbGlkIGZsYWdzIHN1cHBsaWVkIHRv IFJlZ0V4cCBjb25zdHJ1Y3Rvci4iKSkpOwotICAgICAgICBoYXZlRmxhZ3MgPSB0cnVlOworICAg ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIGlmIChjYWxsZWUgPT0gY29uc3RydWN0 b3IpIHsKKyAgICAgICAgICAgIC8vIFdlIGtub3cgdGhhdCBwYXR0ZXJuQXJnIGlzIGEgb2JqZWN0 IG90aGVyd2lzZSBjb25zdHJ1Y3RBc1JlZ2V4cCB3b3VsZCBiZSBmYWxzZS4KKyAgICAgICAgICAg IHJldHVybiBwYXR0ZXJuQXJnLmdldE9iamVjdCgpOworICAgICAgICB9CiAgICAgfQogCi0gICAg aWYgKGFyZzAuaW5oZXJpdHMoUmVnRXhwT2JqZWN0OjppbmZvKCkpKSB7Ci0gICAgICAgIC8vIElm IGNhbGxlZCBhcyBhIGZ1bmN0aW9uLCB0aGlzIGp1c3QgcmV0dXJucyB0aGUgZmlyc3QgYXJndW1l bnQgKHNlZSAxNS4xMC4zLjEpLgotICAgICAgICBpZiAobmV3VGFyZ2V0ICE9IGpzVW5kZWZpbmVk KCkpIHsKLSAgICAgICAgICAgIFJlZ0V4cCogcmVnRXhwID0gc3RhdGljX2Nhc3Q8UmVnRXhwT2Jq ZWN0Kj4oYXNPYmplY3QoYXJnMCkpLT5yZWdFeHAoKTsKLSAgICAgICAgICAgIFN0cnVjdHVyZSog c3RydWN0dXJlID0gZ2V0UmVnRXhwU3RydWN0dXJlKGV4ZWMsIGdsb2JhbE9iamVjdCwgbmV3VGFy Z2V0KTsKLSAgICAgICAgICAgIGlmICh2bS5leGNlcHRpb24oKSkKKyAgICBpZiAoaXNQYXR0ZXJu UmVnRXhwKSB7CisgICAgICAgIFJlZ0V4cCogcmVnRXhwID0ganNDYXN0PFJlZ0V4cE9iamVjdCo+ KHBhdHRlcm5BcmcpLT5yZWdFeHAoKTsKKyAgICAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBn ZXRSZWdFeHBTdHJ1Y3R1cmUoZXhlYywgZ2xvYmFsT2JqZWN0LCBuZXdUYXJnZXQpOworICAgICAg ICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgICAgICBpZiAoIWZsYWdzQXJnLmlzVW5kZWZpbmVkKCkpIHsKKyAgICAgICAgICAgIFJl Z0V4cEZsYWdzIGZsYWdzID0gdG9GbGFncyhleGVjLCBmbGFnc0FyZyk7CisgICAgICAgICAgICBp ZiAoZmxhZ3MgPT0gSW52YWxpZEZsYWdzKQogICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRy OworICAgICAgICAgICAgcmVnRXhwID0gUmVnRXhwOjpjcmVhdGUodm0sIHJlZ0V4cC0+cGF0dGVy bigpLCBmbGFncyk7CisgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKGhhdmVGbGFncykgewot ICAgICAgICAgICAgICAgIHJlZ0V4cCA9IFJlZ0V4cDo6Y3JlYXRlKHZtLCByZWdFeHAtPnBhdHRl cm4oKSwgZmxhZ3MpOwotICAgICAgICAgICAgICAgIGlmICh2bS5leGNlcHRpb24oKSkKLSAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgICAgICB9CisgICAgICAgIHJl dHVybiBSZWdFeHBPYmplY3Q6OmNyZWF0ZShleGVjLT52bSgpLCBzdHJ1Y3R1cmUsIHJlZ0V4cCk7 CisgICAgfQogCi0gICAgICAgICAgICByZXR1cm4gUmVnRXhwT2JqZWN0OjpjcmVhdGUodm0sIHN0 cnVjdHVyZSwgcmVnRXhwKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gYXNPYmplY3QoYXJn MCk7CisgICAgaWYgKGNvbnN0cnVjdEFzUmVnZXhwKSB7CisgICAgICAgIEpTVmFsdWUgcGF0dGVy biA9IHBhdHRlcm5BcmcuZ2V0KGV4ZWMsIHZtLnByb3BlcnR5TmFtZXMtPnNvdXJjZSk7CisgICAg ICAgIGlmIChmbGFnc0FyZy5pc1VuZGVmaW5lZCgpKQorICAgICAgICAgICAgZmxhZ3NBcmcgPSBw YXR0ZXJuQXJnLmdldChleGVjLCB2bS5wcm9wZXJ0eU5hbWVzLT5mbGFncyk7CisgICAgICAgIHBh dHRlcm5BcmcgPSBwYXR0ZXJuOwogICAgIH0KIAotICAgIFN0cmluZyBwYXR0ZXJuID0gYXJnMC5p c1VuZGVmaW5lZCgpID8gZW1wdHlTdHJpbmcoKSA6IGFyZzAudG9TdHJpbmcoZXhlYyktPnZhbHVl KGV4ZWMpOwotICAgIGlmICh2bS5leGNlcHRpb24oKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAg U3RyaW5nIHBhdHRlcm4gPSBwYXR0ZXJuQXJnLmlzVW5kZWZpbmVkKCkgPyBlbXB0eVN0cmluZygp IDogcGF0dGVybkFyZy50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYyk7CisgICAgaWYgKGV4ZWMt PmhhZEV4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIFJlZ0V4cEZs YWdzIGZsYWdzID0gdG9GbGFncyhleGVjLCBmbGFnc0FyZyk7CisgICAgaWYgKGZsYWdzID09IElu dmFsaWRGbGFncykKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBSZWdFeHAqIHJlZ0V4 cCA9IFJlZ0V4cDo6Y3JlYXRlKHZtLCBwYXR0ZXJuLCBmbGFncyk7CiAgICAgaWYgKCFyZWdFeHAt PmlzVmFsaWQoKSkKQEAgLTMxNCw3ICszNDAsNyBAQCBKU09iamVjdCogY29uc3RydWN0UmVnRXhw KEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgY29uc3QgQQog c3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY29uc3RydWN0V2l0aFJlZ0V4cENv bnN0cnVjdG9yKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBBcmdMaXN0IGFyZ3MoZXhlYyk7Ci0g ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjb25zdHJ1Y3RSZWdFeHAoZXhlYywgYXNJbnRlcm5h bEZ1bmN0aW9uKGV4ZWMtPmNhbGxlZSgpKS0+Z2xvYmFsT2JqZWN0KCksIGFyZ3MsIGV4ZWMtPm5l d1RhcmdldCgpKSk7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjb25zdHJ1Y3RSZWdFeHAo ZXhlYywgYXNJbnRlcm5hbEZ1bmN0aW9uKGV4ZWMtPmNhbGxlZSgpKS0+Z2xvYmFsT2JqZWN0KCks IGFyZ3MsIGV4ZWMtPmNhbGxlZSgpLCBleGVjLT5uZXdUYXJnZXQoKSkpOwogfQogCiBDb25zdHJ1 Y3RUeXBlIFJlZ0V4cENvbnN0cnVjdG9yOjpnZXRDb25zdHJ1Y3REYXRhKEpTQ2VsbCosIENvbnN0 cnVjdERhdGEmIGNvbnN0cnVjdERhdGEpCkBAIC0zMjMsMTEgKzM0OSwxMCBAQCBDb25zdHJ1Y3RU eXBlIFJlZ0V4cENvbnN0cnVjdG9yOjpnZXRDb25zdHJ1Y3REYXRhKEpTQ2VsbCosIENvbnN0cnVj dERhdGEmIGNvbnN0cgogICAgIHJldHVybiBDb25zdHJ1Y3RUeXBlOjpIb3N0OwogfQogCi0vLyBF Q01BIDE1LjEwLjMKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNhbGxSZWdF eHBDb25zdHJ1Y3RvcihFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgQXJnTGlzdCBhcmdzKGV4ZWMp OwotICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY29uc3RydWN0UmVnRXhwKGV4ZWMsIGFzSW50 ZXJuYWxGdW5jdGlvbihleGVjLT5jYWxsZWUoKSktPmdsb2JhbE9iamVjdCgpLCBhcmdzKSk7Cisg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjb25zdHJ1Y3RSZWdFeHAoZXhlYywgYXNJbnRlcm5h bEZ1bmN0aW9uKGV4ZWMtPmNhbGxlZSgpKS0+Z2xvYmFsT2JqZWN0KCksIGFyZ3MsIGV4ZWMtPmNh bGxlZSgpKSk7CiB9CiAKIENhbGxUeXBlIFJlZ0V4cENvbnN0cnVjdG9yOjpnZXRDYWxsRGF0YShK U0NlbGwqLCBDYWxsRGF0YSYgY2FsbERhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9SZWdFeHBDb25zdHJ1Y3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvUmVnRXhwQ29uc3RydWN0b3IuaAppbmRleCAyMDNhNWQxODc1ZWIyNjUyN2I0OWQ0 YTA4YTI2MzI4NTVjMjI2NWM0Li42OWQ0NWZjMDA2MmJkM2EzZGZhMzFmN2JjNzdhNTQ5ZjkzNDg3 MmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBDb25z dHJ1Y3Rvci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cENvbnN0 cnVjdG9yLmgKQEAgLTg3LDcgKzg3LDcgQEAgcHJpdmF0ZToKIAogUmVnRXhwQ29uc3RydWN0b3Iq IGFzUmVnRXhwQ29uc3RydWN0b3IoSlNWYWx1ZSk7CiAKLUpTT2JqZWN0KiBjb25zdHJ1Y3RSZWdF eHAoRXhlY1N0YXRlKiwgSlNHbG9iYWxPYmplY3QqLCBjb25zdCBBcmdMaXN0JiwgSlNWYWx1ZSBu ZXdUYXJnZXQgPSBqc1VuZGVmaW5lZCgpKTsKK0pTT2JqZWN0KiBjb25zdHJ1Y3RSZWdFeHAoRXhl Y1N0YXRlKiwgSlNHbG9iYWxPYmplY3QqLCBjb25zdCBBcmdMaXN0JiwgSlNPYmplY3QqIGNhbGxl ZSA9IG51bGxwdHIsIEpTVmFsdWUgbmV3VGFyZ2V0ID0ganNVbmRlZmluZWQoKSk7CiAKIGlubGlu ZSBSZWdFeHBDb25zdHJ1Y3RvciogYXNSZWdFeHBDb25zdHJ1Y3RvcihKU1ZhbHVlIHZhbHVlKQog ewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IGRkNDViZmU1YTRjODQ1MWFiMWMyM2YwYWYyMDhmOTY0NDc0NzliN2UuLmQzNjc0 MGM4NzFjMzI0MTQ1NGExM2Y2MDRkOWU3ZTM0YmY4ZjJkNGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA QAorMjAxNi0wMy0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZWdFeHAgY29uc3RydWN0b3Igc2hvdWxkIHVzZSBTeW1ib2wubWF0Y2ggYW5kIG90 aGVyIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1NTg3MworCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2ZmLgorCisg ICAgICAgIEZpeCB0ZXN0IGZvciBuZXcgYmVoYXZpb3IuCisKKyAgICAgICAgKiBmYXN0L3JlZ2V4 L2NvbnN0cnVjdG9yLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3JlZ2V4L3NjcmlwdC10 ZXN0cy9jb25zdHJ1Y3Rvci5qczoKKwogMjAxNi0wNC0wNiAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6ICFmbG9hdGluZ09iamVjdC0+ b3JpZ2luYXRpbmdMaW5lKCkgaW4gV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsaW5rVG9FbmRM aW5lSWZOZWVkZWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnZXgvY29uc3RydWN0 b3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdleC9jb25zdHJ1Y3Rvci1leHBl Y3RlZC50eHQKaW5kZXggNDEyZDMyMTBmYWRkYWYwN2EyNjhiNzJhY2E1ZDE2Mjg4NWNhZDgzNC4u Y2Y3OTNjMTk2ZDYzODY0ZWUzODg5ZjJjNTE2NWFjNTIxNTRhZTg4NCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvZmFzdC9yZWdleC9jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9yZWdleC9jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQKQEAgLTUsNyArNSw3IEBA IE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFCiAKIFBBU1MgcmUgPT09IFJlZ0V4cChyZSkgaXMgdHJ1 ZQogUEFTUyByZSAhPT0gbmV3IFJlZ0V4cChyZSkgaXMgdHJ1ZQotUEFTUyByZSA9PT0gUmVnRXhw KHJlLCdpJykgaXMgdHJ1ZQorUEFTUyByZSAhPT0gUmVnRXhwKHJlLCdpJykgaXMgdHJ1ZQogUEFT UyByZSAhPT0gbmV3IFJlZ0V4cChyZSwnaScpIGlzIHRydWUKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdleC9zY3JpcHQt dGVzdHMvY29uc3RydWN0b3IuanMgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0 cy9jb25zdHJ1Y3Rvci5qcwppbmRleCA2ZGExMDFjOTQ3ODIwMmVhMGQwZDU1Y2I1ZTlmYjk1ZWI2 N2FlN2YzLi4xMzc4YWRhZTliOGY5YTY4NzUyZmYzZjg3Yjk0NGIxYjc4YjcxZTZkIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9jb25zdHJ1Y3Rvci5qcwor KysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9jb25zdHJ1Y3Rvci5qcwpA QCAtNCw2ICs0LDYgQEAgdmFyIHJlID0gL2FiYy87CiAKIHNob3VsZEJlVHJ1ZSgicmUgPT09IFJl Z0V4cChyZSkiKTsKIHNob3VsZEJlVHJ1ZSgicmUgIT09IG5ldyBSZWdFeHAocmUpIik7Ci1zaG91 bGRCZVRydWUoInJlID09PSBSZWdFeHAocmUsJ2knKSIpOworc2hvdWxkQmVUcnVlKCJyZSAhPT0g UmVnRXhwKHJlLCdpJykiKTsKIHNob3VsZEJlVHJ1ZSgicmUgIT09IG5ldyBSZWdFeHAocmUsJ2kn KSIpOwogCg==