165415 2016-12-05 14:32:38 -0800 ScriptExecutable should not contain a copy of firstLine and startColumn 2016-12-05 14:46:31 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1256494 0 ggaren 2016-12-05 14:32:38 -0800 ScriptExecutable should not contain a copy of firstLine and startColumn 1256498 1 296190 ggaren 2016-12-05 14:36:32 -0800 Created attachment 296190 Patch 1256504 2 296190 keith_miller 2016-12-05 14:42:22 -0800 Comment on attachment 296190 Patch r=me. 1256507 3 ggaren 2016-12-05 14:46:31 -0800 Committed r209353: <http://trac.webkit.org/changeset/209353> 296190 2016-12-05 14:36:32 -0800 2016-12-05 14:42:22 -0800 Patch bug-165415-20161205143601.patch text/plain 12787 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5MzUwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE2LTEyLTA1ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgU2NyaXB0RXhlY3V0YWJsZSBzaG91bGQgbm90IGNvbnRhaW4gYSBjb3B5IG9mIGZpcnN0TGlu ZSBhbmQgc3RhcnRDb2x1bW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2NTQxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdlIGFscmVhZHkgaGF2ZSB0aGlzIGRhdGEgaW4gU291cmNlQ29kZS4KKworICAg ICAgICBJdCdzIHN1cGVyIGNvbmZ1c2luZyB0byBoYXZlIHR3byBjb3BpZXMgb2YgdGhpcyBkYXRh LCB3aGVyZSBvbmUgaXMKKyAgICAgICAgYWxsb3dlZCB0byBtdXRhdGUuIEluIHJlYWxpdHksIHlv dXIgbGluZSBhbmQgY29sdW1uIG51bWJlciBuZXZlciBjaGFuZ2UuCisKKyAgICAgICAgKiBieXRl Y29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZS5jcHA6CisgICAgICAgIChKU0M6OlVubGlu a2VkRnVuY3Rpb25FeGVjdXRhYmxlOjpsaW5rKToKKyAgICAgICAgKiBydW50aW1lL0NvZGVDYWNo ZS5jcHA6CisgICAgICAgIChKU0M6OkNvZGVDYWNoZTo6Z2V0VW5saW5rZWRHbG9iYWxDb2RlQmxv Y2spOgorICAgICAgICAqIHJ1bnRpbWUvQ29kZUNhY2hlLmg6CisgICAgICAgIChKU0M6OmdlbmVy YXRlVW5saW5rZWRDb2RlQmxvY2spOgorICAgICAgICAqIHJ1bnRpbWUvRnVuY3Rpb25FeGVjdXRh YmxlLmNwcDoKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpGdW5jdGlvbkV4ZWN1 dGFibGUpOgorICAgICAgICAqIHJ1bnRpbWUvRnVuY3Rpb25FeGVjdXRhYmxlLmg6CisgICAgICAg ICogcnVudGltZS9TY3JpcHRFeGVjdXRhYmxlLmNwcDoKKyAgICAgICAgKEpTQzo6U2NyaXB0RXhl Y3V0YWJsZTo6U2NyaXB0RXhlY3V0YWJsZSk6CisgICAgICAgIChKU0M6OlNjcmlwdEV4ZWN1dGFi bGU6Om5ld0NvZGVCbG9ja0Zvcik6CisgICAgICAgICogcnVudGltZS9TY3JpcHRFeGVjdXRhYmxl Lmg6CisgICAgICAgIChKU0M6OlNjcmlwdEV4ZWN1dGFibGU6OmZpcnN0TGluZSk6CisgICAgICAg IChKU0M6OlNjcmlwdEV4ZWN1dGFibGU6OnN0YXJ0Q29sdW1uKToKKyAgICAgICAgKEpTQzo6U2Ny aXB0RXhlY3V0YWJsZTo6cmVjb3JkUGFyc2UpOgorCiAyMDE2LTEyLTA1ICBDYWl0bGluIFBvdHRl ciAgPGNhaXRwQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0pTQ10gcmVwb3J0IHVuZXhwZWN0ZWQg dG9rZW4gd2hlbiAiYXN5bmMiIGlzIGZvbGxvd2VkIGJ5IGlkZW50aWZpZXIgCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRGdW5jdGlvbkV4ZWN1dGFibGUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9VbmxpbmtlZEZ1 bmN0aW9uRXhlY3V0YWJsZS5jcHAJKHJldmlzaW9uIDIwOTE5MikKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9VbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE1OSw3ICsxNTksNyBAQCBGdW5jdGlvbkV4ZWN1dGFibGUqIFVubGlua2VkRnVu Y3Rpb25FeGVjCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBGdW5jdGlvbkV4ZWN1dGFibGUqIHJl c3VsdCA9IEZ1bmN0aW9uRXhlY3V0YWJsZTo6Y3JlYXRlKHZtLCBjb2RlLCB0aGlzLCBmaXJzdExp bmUsIGZpcnN0TGluZSArIGxpbmVDb3VudCwgc3RhcnRDb2x1bW4sIGVuZENvbHVtbiwgaW50cmlu c2ljKTsKKyAgICBGdW5jdGlvbkV4ZWN1dGFibGUqIHJlc3VsdCA9IEZ1bmN0aW9uRXhlY3V0YWJs ZTo6Y3JlYXRlKHZtLCBjb2RlLCB0aGlzLCBmaXJzdExpbmUgKyBsaW5lQ291bnQsIGVuZENvbHVt biwgaW50cmluc2ljKTsKICAgICBpZiAob3ZlcnJpZGVMaW5lTnVtYmVyKQogICAgICAgICByZXN1 bHQtPnNldE92ZXJyaWRlTGluZU51bWJlcigqb3ZlcnJpZGVMaW5lTnVtYmVyKTsKIApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29kZUNhY2hlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuY3BwCShyZXZpc2lvbiAy MDkxOTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02NSw3ICs2NSw3IEBAIFVubGlua2VkQ29kZUJsb2NrVHlwZSogQ29k ZUNhY2hlOjpnZXRVbmwKICAgICAgICAgdW5zaWduZWQgc3RhcnRDb2x1bW4gPSB1bmxpbmtlZENv ZGVCbG9jay0+c3RhcnRDb2x1bW4oKSArIHNvdXJjZS5zdGFydENvbHVtbigpOwogICAgICAgICBi b29sIGVuZENvbHVtbklzT25TdGFydExpbmUgPSAhbGluZUNvdW50OwogICAgICAgICB1bnNpZ25l ZCBlbmRDb2x1bW4gPSB1bmxpbmtlZENvZGVCbG9jay0+ZW5kQ29sdW1uKCkgKyAoZW5kQ29sdW1u SXNPblN0YXJ0TGluZSA/IHN0YXJ0Q29sdW1uIDogMSk7Ci0gICAgICAgIGV4ZWN1dGFibGUtPnJl Y29yZFBhcnNlKHVubGlua2VkQ29kZUJsb2NrLT5jb2RlRmVhdHVyZXMoKSwgdW5saW5rZWRDb2Rl QmxvY2stPmhhc0NhcHR1cmVkVmFyaWFibGVzKCksIHNvdXJjZS5maXJzdExpbmUoKSwgc291cmNl LmZpcnN0TGluZSgpICsgbGluZUNvdW50LCBzdGFydENvbHVtbiwgZW5kQ29sdW1uKTsKKyAgICAg ICAgZXhlY3V0YWJsZS0+cmVjb3JkUGFyc2UodW5saW5rZWRDb2RlQmxvY2stPmNvZGVGZWF0dXJl cygpLCB1bmxpbmtlZENvZGVCbG9jay0+aGFzQ2FwdHVyZWRWYXJpYWJsZXMoKSwgc291cmNlLmZp cnN0TGluZSgpICsgbGluZUNvdW50LCBlbmRDb2x1bW4pOwogICAgICAgICBzb3VyY2UucHJvdmlk ZXIoKS0+c2V0U291cmNlVVJMRGlyZWN0aXZlKHVubGlua2VkQ29kZUJsb2NrLT5zb3VyY2VVUkxE aXJlY3RpdmUoKSk7CiAgICAgICAgIHNvdXJjZS5wcm92aWRlcigpLT5zZXRTb3VyY2VNYXBwaW5n VVJMRGlyZWN0aXZlKHVubGlua2VkQ29kZUJsb2NrLT5zb3VyY2VNYXBwaW5nVVJMRGlyZWN0aXZl KCkpOwogICAgICAgICByZXR1cm4gdW5saW5rZWRDb2RlQmxvY2s7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuaAkocmV2aXNpb24gMjA5MjIwKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29kZUNhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAg LTI0Myw3ICsyNDMsNyBAQCBVbmxpbmtlZENvZGVCbG9ja1R5cGUqIGdlbmVyYXRlVW5saW5rZWRD CiAgICAgdW5zaWduZWQgdW5saW5rZWRFbmRDb2x1bW4gPSByb290Tm9kZS0+ZW5kQ29sdW1uKCk7 CiAgICAgdW5zaWduZWQgZW5kQ29sdW1uID0gdW5saW5rZWRFbmRDb2x1bW4gKyAoZW5kQ29sdW1u SXNPblN0YXJ0TGluZSA/IHN0YXJ0Q29sdW1uIDogMSk7CiAgICAgdW5zaWduZWQgYXJyb3dDb250 ZXh0RmVhdHVyZSA9IGV4ZWN1dGFibGUtPmlzQXJyb3dGdW5jdGlvbkNvbnRleHQoKSA/IEFycm93 RnVuY3Rpb25Db250ZXh0RmVhdHVyZSA6IDA7Ci0gICAgZXhlY3V0YWJsZS0+cmVjb3JkUGFyc2Uo cm9vdE5vZGUtPmZlYXR1cmVzKCkgfCBhcnJvd0NvbnRleHRGZWF0dXJlLCByb290Tm9kZS0+aGFz Q2FwdHVyZWRWYXJpYWJsZXMoKSwgcm9vdE5vZGUtPmZpcnN0TGluZSgpLCByb290Tm9kZS0+bGFz dExpbmUoKSwgc3RhcnRDb2x1bW4sIGVuZENvbHVtbik7CisgICAgZXhlY3V0YWJsZS0+cmVjb3Jk UGFyc2Uocm9vdE5vZGUtPmZlYXR1cmVzKCkgfCBhcnJvd0NvbnRleHRGZWF0dXJlLCByb290Tm9k ZS0+aGFzQ2FwdHVyZWRWYXJpYWJsZXMoKSwgcm9vdE5vZGUtPmxhc3RMaW5lKCksIGVuZENvbHVt bik7CiAKICAgICBVbmxpbmtlZENvZGVCbG9ja1R5cGUqIHVubGlua2VkQ29kZUJsb2NrID0gVW5s aW5rZWRDb2RlQmxvY2tUeXBlOjpjcmVhdGUoJnZtLCBleGVjdXRhYmxlLT5leGVjdXRhYmxlSW5m bygpLCBkZWJ1Z2dlck1vZGUpOwogICAgIHVubGlua2VkQ29kZUJsb2NrLT5yZWNvcmRQYXJzZShy b290Tm9kZS0+ZmVhdHVyZXMoKSwgcm9vdE5vZGUtPmhhc0NhcHR1cmVkVmFyaWFibGVzKCksIGxp bmVDb3VudCwgdW5saW5rZWRFbmRDb2x1bW4pOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvRnVuY3Rpb25FeGVjdXRhYmxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9GdW5jdGlvbkV4ZWN1dGFibGUuY3BwCShyZXZpc2lvbiAyMDkx OTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9GdW5jdGlvbkV4ZWN1dGFibGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSwxNyArNDEsMTQgQEAgbmFtZXNwYWNlIEpTQyB7CiAK IGNvbnN0IENsYXNzSW5mbyBGdW5jdGlvbkV4ZWN1dGFibGU6OnNfaW5mbyA9IHsgIkZ1bmN0aW9u RXhlY3V0YWJsZSIsICZTY3JpcHRFeGVjdXRhYmxlOjpzX2luZm8sIDAsIENSRUFURV9NRVRIT0Rf VEFCTEUoRnVuY3Rpb25FeGVjdXRhYmxlKSB9OwogCi1GdW5jdGlvbkV4ZWN1dGFibGU6OkZ1bmN0 aW9uRXhlY3V0YWJsZShWTSYgdm0sIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgVW5saW5rZWRG dW5jdGlvbkV4ZWN1dGFibGUqIHVubGlua2VkRXhlY3V0YWJsZSwgdW5zaWduZWQgZmlyc3RMaW5l LCB1bnNpZ25lZCBsYXN0TGluZSwgdW5zaWduZWQgc3RhcnRDb2x1bW4sIHVuc2lnbmVkIGVuZENv bHVtbiwgSW50cmluc2ljIGludHJpbnNpYykKK0Z1bmN0aW9uRXhlY3V0YWJsZTo6RnVuY3Rpb25F eGVjdXRhYmxlKFZNJiB2bSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBVbmxpbmtlZEZ1bmN0 aW9uRXhlY3V0YWJsZSogdW5saW5rZWRFeGVjdXRhYmxlLCB1bnNpZ25lZCBsYXN0TGluZSwgdW5z aWduZWQgZW5kQ29sdW1uLCBJbnRyaW5zaWMgaW50cmluc2ljKQogICAgIDogU2NyaXB0RXhlY3V0 YWJsZSh2bS5mdW5jdGlvbkV4ZWN1dGFibGVTdHJ1Y3R1cmUuZ2V0KCksIHZtLCBzb3VyY2UsIHVu bGlua2VkRXhlY3V0YWJsZS0+aXNJblN0cmljdENvbnRleHQoKSwgdW5saW5rZWRFeGVjdXRhYmxl LT5kZXJpdmVkQ29udGV4dFR5cGUoKSwgZmFsc2UsIEV2YWxDb250ZXh0VHlwZTo6Tm9uZSwgaW50 cmluc2ljKQogICAgICwgbV91bmxpbmtlZEV4ZWN1dGFibGUodm0sIHRoaXMsIHVubGlua2VkRXhl Y3V0YWJsZSkKIHsKICAgICBSRUxFQVNFX0FTU0VSVCghc291cmNlLmlzTnVsbCgpKTsKICAgICBB U1NFUlQoc291cmNlLmxlbmd0aCgpKTsKLSAgICBtX2ZpcnN0TGluZSA9IGZpcnN0TGluZTsKICAg ICBtX2xhc3RMaW5lID0gbGFzdExpbmU7Ci0gICAgQVNTRVJUKHN0YXJ0Q29sdW1uICE9IFVJTlRf TUFYKTsKICAgICBBU1NFUlQoZW5kQ29sdW1uICE9IFVJTlRfTUFYKTsKLSAgICBtX3N0YXJ0Q29s dW1uID0gc3RhcnRDb2x1bW47CiAgICAgbV9lbmRDb2x1bW4gPSBlbmRDb2x1bW47CiAgICAgbV9w YXJhbWV0ZXJzU3RhcnRPZmZzZXQgPSB1bmxpbmtlZEV4ZWN1dGFibGUtPnBhcmFtZXRlcnNTdGFy dE9mZnNldCgpOwogICAgIG1fdHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0ID0gdW5saW5rZWRFeGVj dXRhYmxlLT50eXBlUHJvZmlsaW5nU3RhcnRPZmZzZXQoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0Z1bmN0aW9uRXhlY3V0YWJsZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Z1bmN0aW9uRXhlY3V0YWJsZS5oCShyZXZpc2lvbiAy MDkxOTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9GdW5jdGlvbkV4ZWN1dGFi bGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzgsOSArMzgsOSBAQCBwdWJsaWM6CiAKICAgICBzdGF0 aWMgRnVuY3Rpb25FeGVjdXRhYmxlKiBjcmVhdGUoCiAgICAgICAgIFZNJiB2bSwgY29uc3QgU291 cmNlQ29kZSYgc291cmNlLCBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSogdW5saW5rZWRFeGVj dXRhYmxlLCAKLSAgICAgICAgdW5zaWduZWQgZmlyc3RMaW5lLCB1bnNpZ25lZCBsYXN0TGluZSwg dW5zaWduZWQgc3RhcnRDb2x1bW4sIHVuc2lnbmVkIGVuZENvbHVtbiwgSW50cmluc2ljIGludHJp bnNpYykKKyAgICAgICAgdW5zaWduZWQgbGFzdExpbmUsIHVuc2lnbmVkIGVuZENvbHVtbiwgSW50 cmluc2ljIGludHJpbnNpYykKICAgICB7Ci0gICAgICAgIEZ1bmN0aW9uRXhlY3V0YWJsZSogZXhl Y3V0YWJsZSA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEZ1bmN0aW9uRXhlY3V0YWJsZT4o dm0uaGVhcCkpIEZ1bmN0aW9uRXhlY3V0YWJsZSh2bSwgc291cmNlLCB1bmxpbmtlZEV4ZWN1dGFi bGUsIGZpcnN0TGluZSwgbGFzdExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRDb2x1bW4sIGludHJpbnNp Yyk7CisgICAgICAgIEZ1bmN0aW9uRXhlY3V0YWJsZSogZXhlY3V0YWJsZSA9IG5ldyAoTm90TnVs bCwgYWxsb2NhdGVDZWxsPEZ1bmN0aW9uRXhlY3V0YWJsZT4odm0uaGVhcCkpIEZ1bmN0aW9uRXhl Y3V0YWJsZSh2bSwgc291cmNlLCB1bmxpbmtlZEV4ZWN1dGFibGUsIGxhc3RMaW5lLCBlbmRDb2x1 bW4sIGludHJpbnNpYyk7CiAgICAgICAgIGV4ZWN1dGFibGUtPmZpbmlzaENyZWF0aW9uKHZtKTsK ICAgICAgICAgcmV0dXJuIGV4ZWN1dGFibGU7CiAgICAgfQpAQCAtMTcyLDggKzE3Miw4IEBAIHB1 YmxpYzoKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEV4ZWN1dGFibGVCYXNlOwogICAgIEZ1 bmN0aW9uRXhlY3V0YWJsZSgKLSAgICAgICAgVk0mLCBjb25zdCBTb3VyY2VDb2RlJiwgVW5saW5r ZWRGdW5jdGlvbkV4ZWN1dGFibGUqLCB1bnNpZ25lZCBmaXJzdExpbmUsIAotICAgICAgICB1bnNp Z25lZCBsYXN0TGluZSwgdW5zaWduZWQgc3RhcnRDb2x1bW4sIHVuc2lnbmVkIGVuZENvbHVtbiwg SW50cmluc2ljKTsKKyAgICAgICAgVk0mLCBjb25zdCBTb3VyY2VDb2RlJiwgVW5saW5rZWRGdW5j dGlvbkV4ZWN1dGFibGUqLAorICAgICAgICB1bnNpZ25lZCBsYXN0TGluZSwgdW5zaWduZWQgZW5k Q29sdW1uLCBJbnRyaW5zaWMpOwogICAgIAogICAgIHZvaWQgZmluaXNoQ3JlYXRpb24oVk0mKTsK IApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NyaXB0RXhlY3V0YWJsZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NyaXB0RXhl Y3V0YWJsZS5jcHAJKHJldmlzaW9uIDIwOTE5MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1NjcmlwdEV4ZWN1dGFibGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw5ICs1Nyw3 IEBAIFNjcmlwdEV4ZWN1dGFibGU6OlNjcmlwdEV4ZWN1dGFibGUoU3RydWMKICAgICAsIG1fZGVy aXZlZENvbnRleHRUeXBlKHN0YXRpY19jYXN0PHVuc2lnbmVkPihkZXJpdmVkQ29udGV4dFR5cGUp KQogICAgICwgbV9ldmFsQ29udGV4dFR5cGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGV2YWxDb250 ZXh0VHlwZSkpCiAgICAgLCBtX292ZXJyaWRlTGluZU51bWJlcigtMSkKLSAgICAsIG1fZmlyc3RM aW5lKC0xKQogICAgICwgbV9sYXN0TGluZSgtMSkKLSAgICAsIG1fc3RhcnRDb2x1bW4oVUlOVF9N QVgpCiAgICAgLCBtX2VuZENvbHVtbihVSU5UX01BWCkKICAgICAsIG1fdHlwZVByb2ZpbGluZ1N0 YXJ0T2Zmc2V0KFVJTlRfTUFYKQogICAgICwgbV90eXBlUHJvZmlsaW5nRW5kT2Zmc2V0KFVJTlRf TUFYKQpAQCAtMTc4LDcgKzE3Niw2IEBAIENvZGVCbG9jayogU2NyaXB0RXhlY3V0YWJsZTo6bmV3 Q29kZUJsb2MKICAgICBhdXRvIHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKCp2bSk7 CiAKICAgICBBU1NFUlQodm0tPmhlYXAuaXNEZWZlcnJlZCgpKTsKLSAgICBBU1NFUlQoc3RhcnRD b2x1bW4oKSAhPSBVSU5UX01BWCk7CiAgICAgQVNTRVJUKGVuZENvbHVtbigpICE9IFVJTlRfTUFY KTsKIAogICAgIGlmIChjbGFzc0luZm8oKSA9PSBFdmFsRXhlY3V0YWJsZTo6aW5mbygpKSB7CkBA IC0xOTgsNyArMTk1LDcgQEAgQ29kZUJsb2NrKiBTY3JpcHRFeGVjdXRhYmxlOjpuZXdDb2RlQmxv YwogICAgICAgICBSRUxFQVNFX0FTU0VSVCghZnVuY3Rpb24pOwogICAgICAgICByZXR1cm4gUHJv Z3JhbUNvZGVCbG9jazo6Y3JlYXRlKHZtLAogICAgICAgICAgICAgZXhlY3V0YWJsZSwgZXhlY3V0 YWJsZS0+bV91bmxpbmtlZFByb2dyYW1Db2RlQmxvY2suZ2V0KCksIHNjb3BlLAotICAgICAgICAg ICAgZXhlY3V0YWJsZS0+c291cmNlKCkucHJvdmlkZXIoKSwgZXhlY3V0YWJsZS0+c291cmNlKCku c3RhcnRDb2x1bW4oKSk7CisgICAgICAgICAgICBleGVjdXRhYmxlLT5zb3VyY2UoKS5wcm92aWRl cigpLCBzdGFydENvbHVtbigpKTsKICAgICB9CiAKICAgICBpZiAoY2xhc3NJbmZvKCkgPT0gTW9k dWxlUHJvZ3JhbUV4ZWN1dGFibGU6OmluZm8oKSkgewpAQCAtMjA4LDcgKzIwNSw3IEBAIENvZGVC bG9jayogU2NyaXB0RXhlY3V0YWJsZTo6bmV3Q29kZUJsb2MKICAgICAgICAgUkVMRUFTRV9BU1NF UlQoIWZ1bmN0aW9uKTsKICAgICAgICAgcmV0dXJuIE1vZHVsZVByb2dyYW1Db2RlQmxvY2s6OmNy ZWF0ZSh2bSwKICAgICAgICAgICAgIGV4ZWN1dGFibGUsIGV4ZWN1dGFibGUtPm1fdW5saW5rZWRN b2R1bGVQcm9ncmFtQ29kZUJsb2NrLmdldCgpLCBzY29wZSwKLSAgICAgICAgICAgIGV4ZWN1dGFi bGUtPnNvdXJjZSgpLnByb3ZpZGVyKCksIGV4ZWN1dGFibGUtPnNvdXJjZSgpLnN0YXJ0Q29sdW1u KCkpOworICAgICAgICAgICAgZXhlY3V0YWJsZS0+c291cmNlKCkucHJvdmlkZXIoKSwgc3RhcnRD b2x1bW4oKSk7CiAgICAgfQogCiAgICAgUkVMRUFTRV9BU1NFUlQoY2xhc3NJbmZvKCkgPT0gRnVu Y3Rpb25FeGVjdXRhYmxlOjppbmZvKCkpOwpAQCAtMjI0LDggKzIyMSw4IEBAIENvZGVCbG9jayog U2NyaXB0RXhlY3V0YWJsZTo6bmV3Q29kZUJsb2MKICAgICAgICAgICAgIGV4ZWN1dGFibGUtPnBh cnNlTW9kZSgpKTsKICAgICByZWNvcmRQYXJzZSgKICAgICAgICAgZXhlY3V0YWJsZS0+bV91bmxp bmtlZEV4ZWN1dGFibGUtPmZlYXR1cmVzKCksIAotICAgICAgICBleGVjdXRhYmxlLT5tX3VubGlu a2VkRXhlY3V0YWJsZS0+aGFzQ2FwdHVyZWRWYXJpYWJsZXMoKSwgZmlyc3RMaW5lKCksIAotICAg ICAgICBsYXN0TGluZSgpLCBzdGFydENvbHVtbigpLCBlbmRDb2x1bW4oKSk7IAorICAgICAgICBl eGVjdXRhYmxlLT5tX3VubGlua2VkRXhlY3V0YWJsZS0+aGFzQ2FwdHVyZWRWYXJpYWJsZXMoKSwK KyAgICAgICAgbGFzdExpbmUoKSwgZW5kQ29sdW1uKCkpOyAKICAgICBpZiAoIXVubGlua2VkQ29k ZUJsb2NrKSB7CiAgICAgICAgIGV4Y2VwdGlvbiA9IHRocm93RXhjZXB0aW9uKAogICAgICAgICAg ICAgZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIHRocm93U2NvcGUsCkBAIC0yMzMsMTIgKzIz MCw4IEBAIENvZGVCbG9jayogU2NyaXB0RXhlY3V0YWJsZTo6bmV3Q29kZUJsb2MKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgU291cmNlUHJvdmlkZXIqIHByb3ZpZGVyID0g ZXhlY3V0YWJsZS0+c291cmNlKCkucHJvdmlkZXIoKTsKLSAgICB1bnNpZ25lZCBzb3VyY2VPZmZz ZXQgPSBleGVjdXRhYmxlLT5zb3VyY2UoKS5zdGFydE9mZnNldCgpOwotICAgIHVuc2lnbmVkIHN0 YXJ0Q29sdW1uID0gZXhlY3V0YWJsZS0+c291cmNlKCkuc3RhcnRDb2x1bW4oKTsKLQotICAgIHJl dHVybiBGdW5jdGlvbkNvZGVCbG9jazo6Y3JlYXRlKHZtLAotICAgICAgICBleGVjdXRhYmxlLCB1 bmxpbmtlZENvZGVCbG9jaywgc2NvcGUsIHByb3ZpZGVyLCBzb3VyY2VPZmZzZXQsIHN0YXJ0Q29s dW1uKTsKKyAgICByZXR1cm4gRnVuY3Rpb25Db2RlQmxvY2s6OmNyZWF0ZSh2bSwgZXhlY3V0YWJs ZSwgdW5saW5rZWRDb2RlQmxvY2ssIHNjb3BlLCAKKyAgICAgICAgc291cmNlKCkucHJvdmlkZXIo KSwgc291cmNlKCkuc3RhcnRPZmZzZXQoKSwgc3RhcnRDb2x1bW4oKSk7CiB9CiAKIENvZGVCbG9j ayogU2NyaXB0RXhlY3V0YWJsZTo6bmV3UmVwbGFjZW1lbnRDb2RlQmxvY2tGb3IoCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TY3JpcHRFeGVjdXRhYmxlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NyaXB0RXhlY3V0YWJsZS5oCShy ZXZpc2lvbiAyMDkxOTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TY3JpcHRF eGVjdXRhYmxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDEyICs0MSwxMiBAQCBwdWJsaWM6CiAg ICAgY29uc3QgU291cmNlQ29kZSYgc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2U7IH0K ICAgICBpbnRwdHJfdCBzb3VyY2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLnByb3ZpZGVy SUQoKTsgfQogICAgIGNvbnN0IFN0cmluZyYgc291cmNlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9z b3VyY2UucHJvdmlkZXIoKS0+dXJsKCk7IH0KLSAgICBpbnQgZmlyc3RMaW5lKCkgY29uc3QgeyBy ZXR1cm4gbV9maXJzdExpbmU7IH0KKyAgICBpbnQgZmlyc3RMaW5lKCkgY29uc3QgeyByZXR1cm4g bV9zb3VyY2UuZmlyc3RMaW5lKCk7IH0KICAgICB2b2lkIHNldE92ZXJyaWRlTGluZU51bWJlcihp bnQgb3ZlcnJpZGVMaW5lTnVtYmVyKSB7IG1fb3ZlcnJpZGVMaW5lTnVtYmVyID0gb3ZlcnJpZGVM aW5lTnVtYmVyOyB9CiAgICAgYm9vbCBoYXNPdmVycmlkZUxpbmVOdW1iZXIoKSBjb25zdCB7IHJl dHVybiBtX292ZXJyaWRlTGluZU51bWJlciAhPSAtMTsgfQogICAgIGludCBvdmVycmlkZUxpbmVO dW1iZXIoKSBjb25zdCB7IHJldHVybiBtX292ZXJyaWRlTGluZU51bWJlcjsgfQogICAgIGludCBs YXN0TGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdExpbmU7IH0KLSAgICB1bnNpZ25lZCBzdGFy dENvbHVtbigpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnRDb2x1bW47IH0KKyAgICB1bnNpZ25lZCBz dGFydENvbHVtbigpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLnN0YXJ0Q29sdW1uKCk7IH0KICAg ICB1bnNpZ25lZCBlbmRDb2x1bW4oKSBjb25zdCB7IHJldHVybiBtX2VuZENvbHVtbjsgfQogICAg IHVuc2lnbmVkIHR5cGVQcm9maWxpbmdTdGFydE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlw ZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0OyB9CiAgICAgdW5zaWduZWQgdHlwZVByb2ZpbGluZ0VuZE9m ZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZVByb2ZpbGluZ0VuZE9mZnNldDsgfQpAQCAtNzks MTQgKzc5LDExIEBAIHB1YmxpYzoKICAgICAgICAgCiAgICAgREVDTEFSRV9FWFBPUlRfSU5GTzsK IAotICAgIHZvaWQgcmVjb3JkUGFyc2UoQ29kZUZlYXR1cmVzIGZlYXR1cmVzLCBib29sIGhhc0Nh cHR1cmVkVmFyaWFibGVzLCBpbnQgZmlyc3RMaW5lLCBpbnQgbGFzdExpbmUsIHVuc2lnbmVkIHN0 YXJ0Q29sdW1uLCB1bnNpZ25lZCBlbmRDb2x1bW4pCisgICAgdm9pZCByZWNvcmRQYXJzZShDb2Rl RmVhdHVyZXMgZmVhdHVyZXMsIGJvb2wgaGFzQ2FwdHVyZWRWYXJpYWJsZXMsIGludCBsYXN0TGlu ZSwgdW5zaWduZWQgZW5kQ29sdW1uKQogICAgIHsKICAgICAgICAgbV9mZWF0dXJlcyA9IGZlYXR1 cmVzOwogICAgICAgICBtX2hhc0NhcHR1cmVkVmFyaWFibGVzID0gaGFzQ2FwdHVyZWRWYXJpYWJs ZXM7Ci0gICAgICAgIG1fZmlyc3RMaW5lID0gZmlyc3RMaW5lOwogICAgICAgICBtX2xhc3RMaW5l ID0gbGFzdExpbmU7Ci0gICAgICAgIEFTU0VSVChzdGFydENvbHVtbiAhPSBVSU5UX01BWCk7Ci0g ICAgICAgIG1fc3RhcnRDb2x1bW4gPSBzdGFydENvbHVtbjsKICAgICAgICAgQVNTRVJUKGVuZENv bHVtbiAhPSBVSU5UX01BWCk7CiAgICAgICAgIG1fZW5kQ29sdW1uID0gZW5kQ29sdW1uOwogICAg IH0KQEAgLTEzNSw5ICsxMzIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdW5zaWduZWQgbV9ldmFsQ29u dGV4dFR5cGUgOiAyOyAvLyBFdmFsQ29udGV4dFR5cGUKIAogICAgIGludCBtX292ZXJyaWRlTGlu ZU51bWJlcjsKLSAgICBpbnQgbV9maXJzdExpbmU7CiAgICAgaW50IG1fbGFzdExpbmU7Ci0gICAg dW5zaWduZWQgbV9zdGFydENvbHVtbjsKICAgICB1bnNpZ25lZCBtX2VuZENvbHVtbjsKICAgICB1 bnNpZ25lZCBtX3R5cGVQcm9maWxpbmdTdGFydE9mZnNldDsKICAgICB1bnNpZ25lZCBtX3R5cGVQ cm9maWxpbmdFbmRPZmZzZXQ7Cg==