67892 2011-09-10 11:22:19 -0700 Add isInterruptedExecutionException and isTerminatedExecutionException predicates 2011-09-10 22:15:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 465302 0 sam 2011-09-10 11:22:19 -0700 Add isInterruptedExecutionException and isTerminatedExecutionException predicates 465303 1 106977 sam 2011-09-10 11:23:57 -0700 Created attachment 106977 Patch 465350 2 106991 sam 2011-09-10 17:10:20 -0700 Created attachment 106991 Patch 465369 3 106991 aestes 2011-09-10 22:08:40 -0700 Comment on attachment 106991 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106991&action=review r=me > Source/JavaScriptCore/runtime/ExceptionHelpers.cpp:66 > + Extra newline. > Source/JavaScriptCore/runtime/ExceptionHelpers.cpp:89 > + Ditto. 465370 4 sam 2011-09-10 22:15:06 -0700 Committed r94918: <http://trac.webkit.org/changeset/94918> 106977 2011-09-10 11:23:57 -0700 2011-09-10 17:10:04 -0700 Patch bug-67892-20110910112356.patch text/plain 9625 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTEtMDktMTAgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQg aXNJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbiBhbmQgaXNUZXJtaW5hdGVkRXhlY3V0aW9u RXhjZXB0aW9uIHByZWRpY2F0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY3ODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5leHA6CisgICAgICAgIEFkZCBzeW1ib2xzLgor CisgICAgICAgICogaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwOgorICAgICAgICAoSlNDOjpJ bnRlcnByZXRlcjo6dGhyb3dFeGNlcHRpb24pOgorICAgICAgICBVc2UgbmV3IHByZWRpY2F0ZXMu CisKKyAgICAgICAgKiBydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuY3BwOgorICAgICAgICAoSlND OjpjcmVhdGVJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbik6CisgICAgICAgIChKU0M6Omlz SW50ZXJydXB0ZWRFeGVjdXRpb25FeGNlcHRpb24pOgorICAgICAgICAoSlNDOjpjcmVhdGVUZXJt aW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9uKToKKyAgICAgICAgKEpTQzo6aXNUZXJtaW5hdGVkRXhl Y3V0aW9uRXhjZXB0aW9uKToKKyAgICAgICAgKiBydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaDoK KyAgICAgICAgKEpTQzo6SW50ZXJydXB0ZWRFeGVjdXRpb25FcnJvcjo6SW50ZXJydXB0ZWRFeGVj dXRpb25FcnJvcik6CisgICAgICAgIEFkZCBwcmVkaWNhdGVzLgorCiAyMDExLTA5LTA5ICBDaHJp cyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4KIAogICAgICAgICByZXF1ZXN0QW5pbWF0aW9u RnJhbWUgZG9lc24ndCB0aHJvdHRsZSBvbiBNYWMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS5leHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L0phdmFTY3JpcHRDb3JlLmV4cAkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTksMTQgKzIxOSwx NSBAQCBfX1pOM0pTQzIwV3JpdGVCYXJyaWVyQ291bnRlcnMyNXVzZXNXaXRoCiBfX1pOM0pTQzIw Y3JlYXRlUmVmZXJlbmNlRXJyb3JFUE5TXzlFeGVjU3RhdGVFUktOU183VVN0cmluZ0UKIF9fWk4z SlNDMjJnbG9iYWxNZW1vcnlTdGF0aXN0aWNzRXYKIF9fWk4zSlNDMjJvYmplY3RDb25zdHJ1Y3Rv clRhYmxlRQotX19aTjNKU0MyM0Fic3RyYWN0U2FtcGxpbmdDb3VudGVyNGR1bXBFdgogX19aTjNK U0MyM0Fic3RyYWN0U2FtcGxpbmdDb3VudGVyMzBzX2Fic3RyYWN0U2FtcGxpbmdDb3VudGVyQ2hh aW5FCitfX1pOM0pTQzIzQWJzdHJhY3RTYW1wbGluZ0NvdW50ZXI0ZHVtcEV2CiBfX1pOM0pTQzIz b2JqZWN0UHJvdG9GdW5jVG9TdHJpbmdFUE5TXzlFeGVjU3RhdGVFCiBfX1pOM0pTQzIzc2V0VXBT dGF0aWNGdW5jdGlvblNsb3RFUE5TXzlFeGVjU3RhdGVFUEtOU185SGFzaEVudHJ5RVBOU184SlNP YmplY3RFUktOU18xMElkZW50aWZpZXJFUk5TXzEyUHJvcGVydHlTbG90RQogX19aTjNKU0MyNER5 bmFtaWNHbG9iYWxPYmplY3RTY29wZUMxRVJOU18xMkpTR2xvYmFsRGF0YUVQTlNfMTRKU0dsb2Jh bE9iamVjdEUKIF9fWk4zSlNDMjRUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3I2c19pbmZvRQogX19a TjNKU0MyNGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJvckVQTlNfOUV4ZWNTdGF0ZUUKIF9fWk4zSlND MjVldmFsdWF0ZUluR2xvYmFsQ2FsbEZyYW1lRVJLTlNfN1VTdHJpbmdFUk5TXzdKU1ZhbHVlRVBO U18xNEpTR2xvYmFsT2JqZWN0RQorX19aTjNKU0MzMGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2Vw dGlvbkVOU183SlNWYWx1ZUUKIF9fWk4zSlNDMzVjcmVhdGVJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4 Y2VwdGlvbkVQTlNfMTJKU0dsb2JhbERhdGFFCiBfX1pOM0pTQzQxY29uc3RydWN0RnVuY3Rpb25T a2lwcGluZ0V2YWxFbmFibGVkQ2hlY2tFUE5TXzlFeGVjU3RhdGVFUE5TXzE0SlNHbG9iYWxPYmpl Y3RFUktOU183QXJnTGlzdEVSS05TXzEwSWRlbnRpZmllckVSS05TXzdVU3RyaW5nRWkKIF9fWk4z SlNDNEhlYXAxMW9iamVjdENvdW50RXYKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRl cnByZXRlci9JbnRlcnByZXRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03MDgsNyArNzA4LDcgQEAgTkVWRVJfSU5MSU5FIEhhbmRsZXJJbmZvKiBJbnRlcnBy ZXRlcjo6dAogICAgICAgICAgICAgYWRkRXJyb3JJbmZvKGNhbGxGcmFtZSwgZXhjZXB0aW9uLCBj b2RlQmxvY2stPmxpbmVOdW1iZXJGb3JCeXRlY29kZU9mZnNldChieXRlY29kZU9mZnNldCksIGNv ZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCktPnNvdXJjZSgpKTsKICAgICAgICAgfQogCi0gICAg ICAgIGlzSW50ZXJydXB0ID0gKGV4Y2VwdGlvbi0+aW5oZXJpdHMoJkludGVycnVwdGVkRXhlY3V0 aW9uRXJyb3I6OnNfaW5mbykgfHwgZXhjZXB0aW9uLT5pbmhlcml0cygmVGVybWluYXRlZEV4ZWN1 dGlvbkVycm9yOjpzX2luZm8pKTsKKyAgICAgICAgaXNJbnRlcnJ1cHQgPSBpc0ludGVycnVwdGVk RXhlY3V0aW9uRXhjZXB0aW9uKGV4Y2VwdGlvbikgfHwgaXNUZXJtaW5hdGVkRXhlY3V0aW9uRXhj ZXB0aW9uKGV4Y2VwdGlvbik7CiAgICAgfQogCiAgICAgaWYgKERlYnVnZ2VyKiBkZWJ1Z2dlciA9 IGNhbGxGcmFtZS0+ZHluYW1pY0dsb2JhbE9iamVjdCgpLT5kZWJ1Z2dlcigpKSB7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmNw cAkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNl cHRpb25IZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsMjIgQEAgVVN0cmlu ZyBJbnRlcnJ1cHRlZEV4ZWN1dGlvbkVycm9yOjp0b1N0cgogICAgIHJldHVybiAiSmF2YVNjcmlw dCBleGVjdXRpb24gZXhjZWVkZWQgdGltZW91dC4iOwogfQogCitKU09iamVjdCogY3JlYXRlSW50 ZXJydXB0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhKQorewor ICAgIHJldHVybiBJbnRlcnJ1cHRlZEV4ZWN1dGlvbkVycm9yOjpjcmVhdGUoKmdsb2JhbERhdGEp OworfQorCitib29sIGlzSW50ZXJydXB0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNPYmplY3QqIG9i amVjdCkKK3sKKyAgICByZXR1cm4gb2JqZWN0LT5pbmhlcml0cygmSW50ZXJydXB0ZWRFeGVjdXRp b25FcnJvcjo6c19pbmZvKTsKK30KKworYm9vbCBpc0ludGVycnVwdGVkRXhlY3V0aW9uRXhjZXB0 aW9uKEpTVmFsdWUgdmFsdWUpCit7CisgICAgcmV0dXJuIHZhbHVlLmluaGVyaXRzKCZJbnRlcnJ1 cHRlZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8pOworfQorCisKIGNvbnN0IENsYXNzSW5mbyBUZXJt aW5hdGVkRXhlY3V0aW9uRXJyb3I6OnNfaW5mbyA9IHsgIlRlcm1pbmF0ZWRFeGVjdXRpb25FcnJv ciIsICZCYXNlOjpzX2luZm8sIDAsIDAgfTsKIAogVVN0cmluZyBUZXJtaW5hdGVkRXhlY3V0aW9u RXJyb3I6OnRvU3RyaW5nKEV4ZWNTdGF0ZSopIGNvbnN0CkBAIC01NSwxNyArNzEsMjIgQEAgVVN0 cmluZyBUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3I6OnRvU3RyaQogICAgIHJldHVybiAiSmF2YVNj cmlwdCBleGVjdXRpb24gdGVybWluYXRlZC4iOwogfQogCitKU09iamVjdCogY3JlYXRlVGVybWlu YXRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEpCit7CisgICAg cmV0dXJuIFRlcm1pbmF0ZWRFeGVjdXRpb25FcnJvcjo6Y3JlYXRlKCpnbG9iYWxEYXRhKTsKK30K IAotSlNPYmplY3QqIGNyZWF0ZUludGVycnVwdGVkRXhlY3V0aW9uRXhjZXB0aW9uKEpTR2xvYmFs RGF0YSogZ2xvYmFsRGF0YSkKK2Jvb2wgaXNUZXJtaW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9uKEpT T2JqZWN0KiBvYmplY3QpCiB7Ci0gICAgcmV0dXJuIEludGVycnVwdGVkRXhlY3V0aW9uRXJyb3I6 OmNyZWF0ZSgqZ2xvYmFsRGF0YSk7CisgICAgcmV0dXJuIG9iamVjdC0+aW5oZXJpdHMoJlRlcm1p bmF0ZWRFeGVjdXRpb25FcnJvcjo6c19pbmZvKTsKIH0KIAotSlNPYmplY3QqIGNyZWF0ZVRlcm1p bmF0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhKQorYm9vbCBp c1Rlcm1pbmF0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNWYWx1ZSB2YWx1ZSkKIHsKLSAgICByZXR1 cm4gVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yOjpjcmVhdGUoKmdsb2JhbERhdGEpOworICAgIHJl dHVybiB2YWx1ZS5pbmhlcml0cygmVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8pOwog fQogCisKIEpTT2JqZWN0KiBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoRXhlY1N0YXRlKiBleGVj KQogewogICAgIHJldHVybiBjcmVhdGVSYW5nZUVycm9yKGV4ZWMsICJNYXhpbXVtIGNhbGwgc3Rh Y2sgc2l6ZSBleGNlZWRlZC4iKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0V4Y2VwdGlvbkhlbHBlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmgJKHJldmlzaW9uIDk0OTA5KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCSh3b3JraW5nIGNvcHkpCkBA IC0zNCw3ICszNCwxMyBAQAogbmFtZXNwYWNlIEpTQyB7CiAKIEpTT2JqZWN0KiBjcmVhdGVJbnRl cnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU0dsb2JhbERhdGEqKTsKK2Jvb2wgaXNJbnRlcnJ1 cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU09iamVjdCopOworYm9vbCBpc0ludGVycnVwdGVkRXhl Y3V0aW9uRXhjZXB0aW9uKEpTVmFsdWUpOworCiBKU09iamVjdCogY3JlYXRlVGVybWluYXRlZEV4 ZWN1dGlvbkV4Y2VwdGlvbihKU0dsb2JhbERhdGEqKTsKK2Jvb2wgaXNUZXJtaW5hdGVkRXhlY3V0 aW9uRXhjZXB0aW9uKEpTT2JqZWN0Kik7Citib29sIGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2Vw dGlvbihKU1ZhbHVlKTsKKwogSlNPYmplY3QqIGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJvcihFeGVj U3RhdGUqKTsKIEpTT2JqZWN0KiBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoSlNHbG9iYWxPYmpl Y3QqKTsKIEpTT2JqZWN0KiBjcmVhdGVPdXRPZk1lbW9yeUVycm9yKEpTR2xvYmFsT2JqZWN0Kik7 CkBAIC01NCw4ICs2MCw4IEBAIHByaXZhdGU6CiAgICAgSW50ZXJydXB0ZWRFeGVjdXRpb25FcnJv cihKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEpCiAgICAgICAgIDogSlNOb25GaW5hbE9iamVjdChn bG9iYWxEYXRhLCBnbG9iYWxEYXRhLmludGVycnVwdGVkRXhlY3V0aW9uRXJyb3JTdHJ1Y3R1cmUu Z2V0KCkpCiAgICAgewotICAgIH0KIAorICAgIH0KICAgICB2aXJ0dWFsIFVTdHJpbmcgdG9TdHJp bmcoRXhlY1N0YXRlKikgY29uc3Q7CiAKIHB1YmxpYzoKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9u IDk0OTA5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTggQEAKKzIwMTEtMDktMTAgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBBZGQgaXNJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbiBhbmQgaXNUZXJtaW5h dGVkRXhlY3V0aW9uRXhjZXB0aW9uIHByZWRpY2F0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3ODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6cmVwb3J0RXhjZXB0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9KU0V2ZW50TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNFdmVudExpc3RlbmVy OjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyOjpldmFs dWF0ZSk6CisgICAgICAgIFVzZSB0aGUgbmV3IHByZWRpY2F0ZXMgaW5zdGVhZCBvZiBwcm9iaW5n IHRoZSBDbGFzc0luZm8gZGlyZWN0bHkuCisKIDIwMTEtMDktMDkgIENocmlzIE1hcnJpbiAgPGNt YXJyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSBkb2Vzbid0 IHRocm90dGxlIG9uIE1hYwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01C aW5kaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RP TUJpbmRpbmcuY3BwCShyZXZpc2lvbiA5NDkwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTRE9NQmluZGluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MSw3ICsxNzEsNyBAQCBk b3VibGUgdmFsdWVUb0RhdGUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhCiAKIHZvaWQgcmVwb3J0RXhj ZXB0aW9uKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBleGNlcHRpb24pCiB7Ci0gICAgaWYgKGV4 Y2VwdGlvbi5pbmhlcml0cygmVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8pKQorICAg IGlmIChpc1Rlcm1pbmF0ZWRFeGVjdXRpb25FeGNlcHRpb24oZXhjZXB0aW9uKSkKICAgICAgICAg cmV0dXJuOwogCiAgICAgVVN0cmluZyBlcnJvck1lc3NhZ2UgPSBleGNlcHRpb24udG9TdHJpbmco ZXhlYyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0 ZW5lci5jcHAJKHJldmlzaW9uIDk0OTA5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNFdmVudExpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM0LDcgKzEzNCw3IEBAIHZv aWQgSlNFdmVudExpc3RlbmVyOjpoYW5kbGVFdmVudChTY3JpcHQKIAogI2lmIEVOQUJMRShXT1JL RVJTKQogICAgICAgICBpZiAoc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+aXNXb3JrZXJDb250ZXh0 KCkpIHsKLSAgICAgICAgICAgIGJvb2wgdGVybWluYXRvckNhdXNlZEV4Y2VwdGlvbiA9IChleGVj LT5oYWRFeGNlcHRpb24oKSAmJiBleGVjLT5leGNlcHRpb24oKS5pbmhlcml0cygmVGVybWluYXRl ZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8pKTsKKyAgICAgICAgICAgIGJvb2wgdGVybWluYXRvckNh dXNlZEV4Y2VwdGlvbiA9IChleGVjLT5oYWRFeGNlcHRpb24oKSAmJiBpc1Rlcm1pbmF0ZWRFeGVj dXRpb25FeGNlcHRpb24oZXhlYy0+ZXhjZXB0aW9uKCkpKTsKICAgICAgICAgICAgIGlmICh0ZXJt aW5hdG9yQ2F1c2VkRXhjZXB0aW9uIHx8IGdsb2JhbERhdGEudGVybWluYXRvci5zaG91bGRUZXJt aW5hdGUoKSkKICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxXb3JrZXJDb250ZXh0Kj4oc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCktPnNjcmlwdCgpLT5mb3JiaWRFeGVjdXRpb24oKTsKICAgICAg ICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJv bGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2Vy U2NyaXB0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDk0OTA5KQorKysgU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEzMiwxMyArMTMyLDE0IEBAIFNjcmlwdFZhbHVlIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6OmV2 YWwKIAogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IG1fd29ya2VyQ29udGV4dFdyYXBwZXItPmdsb2Jh bEV4ZWMoKTsKIAotICAgIEpTVmFsdWUgZXZhbHVhdGlvbkV4Y2VwdGlvbjsKLQogICAgIG1fd29y a2VyQ29udGV4dFdyYXBwZXItPmdsb2JhbERhdGEoKS50aW1lb3V0Q2hlY2tlci5zdGFydCgpOwor CisgICAgSlNWYWx1ZSBldmFsdWF0aW9uRXhjZXB0aW9uOwogICAgIEpTVmFsdWUgcmV0dXJuVmFs dWUgPSBKU0M6OmV2YWx1YXRlKGV4ZWMsIGV4ZWMtPmR5bmFtaWNHbG9iYWxPYmplY3QoKS0+Z2xv YmFsU2NvcGVDaGFpbigpLCBzb3VyY2VDb2RlLmpzU291cmNlQ29kZSgpLCBtX3dvcmtlckNvbnRl eHRXcmFwcGVyLmdldCgpLCAmZXZhbHVhdGlvbkV4Y2VwdGlvbik7CisKICAgICBtX3dvcmtlckNv bnRleHRXcmFwcGVyLT5nbG9iYWxEYXRhKCkudGltZW91dENoZWNrZXIuc3RvcCgpOwogCi0gICAg aWYgKChldmFsdWF0aW9uRXhjZXB0aW9uICYmIGV2YWx1YXRpb25FeGNlcHRpb24uaW5oZXJpdHMo JlRlcm1pbmF0ZWRFeGVjdXRpb25FcnJvcjo6c19pbmZvKSkgfHwgIG1fd29ya2VyQ29udGV4dFdy YXBwZXItPmdsb2JhbERhdGEoKS50ZXJtaW5hdG9yLnNob3VsZFRlcm1pbmF0ZSgpKSB7CisgICAg aWYgKChldmFsdWF0aW9uRXhjZXB0aW9uICYmIGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2VwdGlv bihldmFsdWF0aW9uRXhjZXB0aW9uKSkgfHwgIG1fd29ya2VyQ29udGV4dFdyYXBwZXItPmdsb2Jh bERhdGEoKS50ZXJtaW5hdG9yLnNob3VsZFRlcm1pbmF0ZSgpKSB7CiAgICAgICAgIGZvcmJpZEV4 ZWN1dGlvbigpOwogICAgICAgICByZXR1cm4gU2NyaXB0VmFsdWUoKTsKICAgICB9Cg== 106991 2011-09-10 17:10:20 -0700 2011-09-10 22:08:40 -0700 Patch bug-67892-20110910171019.patch text/plain 10647 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTEtMDktMTAgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQg aXNJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbiBhbmQgaXNUZXJtaW5hdGVkRXhlY3V0aW9u RXhjZXB0aW9uIHByZWRpY2F0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY3ODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5leHA6CisgICAgICAgIEFkZCBzeW1ib2xzLgor CisgICAgICAgICogaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwOgorICAgICAgICAoSlNDOjpJ bnRlcnByZXRlcjo6dGhyb3dFeGNlcHRpb24pOgorICAgICAgICBVc2UgbmV3IHByZWRpY2F0ZXMu CisKKyAgICAgICAgKiBydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuY3BwOgorICAgICAgICAoSlND OjpjcmVhdGVJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbik6CisgICAgICAgIChKU0M6Omlz SW50ZXJydXB0ZWRFeGVjdXRpb25FeGNlcHRpb24pOgorICAgICAgICAoSlNDOjpjcmVhdGVUZXJt aW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9uKToKKyAgICAgICAgKEpTQzo6aXNUZXJtaW5hdGVkRXhl Y3V0aW9uRXhjZXB0aW9uKToKKyAgICAgICAgKiBydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaDoK KyAgICAgICAgKEpTQzo6SW50ZXJydXB0ZWRFeGVjdXRpb25FcnJvcjo6SW50ZXJydXB0ZWRFeGVj dXRpb25FcnJvcik6CisgICAgICAgIEFkZCBwcmVkaWNhdGVzLgorCiAyMDExLTA5LTA5ICBDaHJp cyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4KIAogICAgICAgICByZXF1ZXN0QW5pbWF0aW9u RnJhbWUgZG9lc24ndCB0aHJvdHRsZSBvbiBNYWMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS5leHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L0phdmFTY3JpcHRDb3JlLmV4cAkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTksMTQgKzIxOSwx NSBAQCBfX1pOM0pTQzIwV3JpdGVCYXJyaWVyQ291bnRlcnMyNXVzZXNXaXRoCiBfX1pOM0pTQzIw Y3JlYXRlUmVmZXJlbmNlRXJyb3JFUE5TXzlFeGVjU3RhdGVFUktOU183VVN0cmluZ0UKIF9fWk4z SlNDMjJnbG9iYWxNZW1vcnlTdGF0aXN0aWNzRXYKIF9fWk4zSlNDMjJvYmplY3RDb25zdHJ1Y3Rv clRhYmxlRQotX19aTjNKU0MyM0Fic3RyYWN0U2FtcGxpbmdDb3VudGVyNGR1bXBFdgogX19aTjNK U0MyM0Fic3RyYWN0U2FtcGxpbmdDb3VudGVyMzBzX2Fic3RyYWN0U2FtcGxpbmdDb3VudGVyQ2hh aW5FCitfX1pOM0pTQzIzQWJzdHJhY3RTYW1wbGluZ0NvdW50ZXI0ZHVtcEV2CiBfX1pOM0pTQzIz b2JqZWN0UHJvdG9GdW5jVG9TdHJpbmdFUE5TXzlFeGVjU3RhdGVFCiBfX1pOM0pTQzIzc2V0VXBT dGF0aWNGdW5jdGlvblNsb3RFUE5TXzlFeGVjU3RhdGVFUEtOU185SGFzaEVudHJ5RVBOU184SlNP YmplY3RFUktOU18xMElkZW50aWZpZXJFUk5TXzEyUHJvcGVydHlTbG90RQogX19aTjNKU0MyNER5 bmFtaWNHbG9iYWxPYmplY3RTY29wZUMxRVJOU18xMkpTR2xvYmFsRGF0YUVQTlNfMTRKU0dsb2Jh bE9iamVjdEUKIF9fWk4zSlNDMjRUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3I2c19pbmZvRQogX19a TjNKU0MyNGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJvckVQTlNfOUV4ZWNTdGF0ZUUKIF9fWk4zSlND MjVldmFsdWF0ZUluR2xvYmFsQ2FsbEZyYW1lRVJLTlNfN1VTdHJpbmdFUk5TXzdKU1ZhbHVlRVBO U18xNEpTR2xvYmFsT2JqZWN0RQorX19aTjNKU0MzMGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2Vw dGlvbkVOU183SlNWYWx1ZUUKIF9fWk4zSlNDMzVjcmVhdGVJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4 Y2VwdGlvbkVQTlNfMTJKU0dsb2JhbERhdGFFCiBfX1pOM0pTQzQxY29uc3RydWN0RnVuY3Rpb25T a2lwcGluZ0V2YWxFbmFibGVkQ2hlY2tFUE5TXzlFeGVjU3RhdGVFUE5TXzE0SlNHbG9iYWxPYmpl Y3RFUktOU183QXJnTGlzdEVSS05TXzEwSWRlbnRpZmllckVSS05TXzdVU3RyaW5nRWkKIF9fWk4z SlNDNEhlYXAxMW9iamVjdENvdW50RXYKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZh U2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZGVmCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2 YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZGVmCShyZXZpc2lvbiA5NDkwOSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUvSmF2 YVNjcmlwdENvcmUuZGVmCSh3b3JraW5nIGNvcHkpCkBAIC0xOCw3ICsxOCw3IEBAIEVYUE9SVFMK ICAgICA/PzBSZWdFeHBPYmplY3RASlNDQEBJQUVAUEFWSlNHbG9iYWxPYmplY3RAMUBQQVZTdHJ1 Y3R1cmVAMUBQQVZSZWdFeHBAMUBAWgogICAgID8/MFNIQTFAV1RGQEBRQUVAWFoKICAgICA/PzBT dHJpbmdPYmplY3RASlNDQEBJQUVAQUFWSlNHbG9iYWxEYXRhQDFAUEFWU3RydWN0dXJlQDFAQFoK LSAgID8/MFN0cnVjdHVyZUBKU0NAQEFBRUBBQVZKU0dsb2JhbERhdGFAMUBQQVZKU0dsb2JhbE9i amVjdEAxQFZKU1ZhbHVlQDFAQUJWVHlwZUluZm9AMUBJUEJVQ2xhc3NJbmZvQDFAQFoKKyAgICA/ PzBTdHJ1Y3R1cmVASlNDQEBBQUVAQUFWSlNHbG9iYWxEYXRhQDFAUEFWSlNHbG9iYWxPYmplY3RA MUBWSlNWYWx1ZUAxQEFCVlR5cGVJbmZvQDFASVBCVUNsYXNzSW5mb0AxQEBaCiAgICAgPz8wVGhy ZWFkQ29uZGl0aW9uQFdURkBAUUFFQFhaCiAgICAgPz8wVVN0cmluZ0BKU0NAQFFBRUBQQkRAWgog ICAgID8/MFVTdHJpbmdASlNDQEBRQUVAUEJESUBaCkBAIC0yNDAsNiArMjQwLDcgQEAgRVhQT1JU UwogICAgID9pc0hvc3RGdW5jdGlvbk5vbklubGluZUBKU0Z1bmN0aW9uQEpTQ0BAQUJFX05YWgog ICAgID9pc01haW5UaHJlYWRAV1RGQEBZQV9OWFoKICAgICA/aXNSZWFjaGFibGVGcm9tT3BhcXVl Um9vdHNAV2Vha0hhbmRsZU93bmVyQEpTQ0BAVUFFX05WPyRIYW5kbGVAVzRVbmtub3duQEpTQ0BA QDJAUEFYQUFWU2xvdFZpc2l0b3JAMkBAWgorICAgID9pc1Rlcm1pbmF0ZWRFeGVjdXRpb25FeGNl cHRpb25ASlNDQEBZQV9OVkpTVmFsdWVAMUBAWgogICAgID9pc1ZhbGlkQWxsb2NhdGlvbkBIZWFw QEpTQ0BAQUFFX05JQFoKICAgICA/aXNWYWxpZENhbGxlZUBKU1ZhbHVlQEpTQ0BAUUFFX05YWgog ICAgID9pc1ZhcmlhYmxlT2JqZWN0QEpTVmFyaWFibGVPYmplY3RASlNDQEBVQkVfTlhaCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5j cHAJKHJldmlzaW9uIDk0OTA5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVy L0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzA4LDcgKzcwOCw3IEBAIE5FVkVS X0lOTElORSBIYW5kbGVySW5mbyogSW50ZXJwcmV0ZXI6OnQKICAgICAgICAgICAgIGFkZEVycm9y SW5mbyhjYWxsRnJhbWUsIGV4Y2VwdGlvbiwgY29kZUJsb2NrLT5saW5lTnVtYmVyRm9yQnl0ZWNv ZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpLCBjb2RlQmxvY2stPm93bmVyRXhlY3V0YWJsZSgpLT5z b3VyY2UoKSk7CiAgICAgICAgIH0KIAotICAgICAgICBpc0ludGVycnVwdCA9IChleGNlcHRpb24t PmluaGVyaXRzKCZJbnRlcnJ1cHRlZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8pIHx8IGV4Y2VwdGlv bi0+aW5oZXJpdHMoJlRlcm1pbmF0ZWRFeGVjdXRpb25FcnJvcjo6c19pbmZvKSk7CisgICAgICAg IGlzSW50ZXJydXB0ID0gaXNJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihleGNlcHRpb24p IHx8IGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihleGNlcHRpb24pOwogICAgIH0KIAog ICAgIGlmIChEZWJ1Z2dlciogZGVidWdnZXIgPSBjYWxsRnJhbWUtPmR5bmFtaWNHbG9iYWxPYmpl Y3QoKS0+ZGVidWdnZXIoKSkgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv RXhjZXB0aW9uSGVscGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5jcHAJKHJldmlzaW9uIDk0OTA5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQ4LDYgKzQ4LDIyIEBAIFVTdHJpbmcgSW50ZXJydXB0ZWRFeGVjdXRpb25FcnJvcjo6 dG9TdHIKICAgICByZXR1cm4gIkphdmFTY3JpcHQgZXhlY3V0aW9uIGV4Y2VlZGVkIHRpbWVvdXQu IjsKIH0KIAorSlNPYmplY3QqIGNyZWF0ZUludGVycnVwdGVkRXhlY3V0aW9uRXhjZXB0aW9uKEpT R2xvYmFsRGF0YSogZ2xvYmFsRGF0YSkKK3sKKyAgICByZXR1cm4gSW50ZXJydXB0ZWRFeGVjdXRp b25FcnJvcjo6Y3JlYXRlKCpnbG9iYWxEYXRhKTsKK30KKworYm9vbCBpc0ludGVycnVwdGVkRXhl Y3V0aW9uRXhjZXB0aW9uKEpTT2JqZWN0KiBvYmplY3QpCit7CisgICAgcmV0dXJuIG9iamVjdC0+ aW5oZXJpdHMoJkludGVycnVwdGVkRXhlY3V0aW9uRXJyb3I6OnNfaW5mbyk7Cit9CisKK2Jvb2wg aXNJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU1ZhbHVlIHZhbHVlKQoreworICAgIHJl dHVybiB2YWx1ZS5pbmhlcml0cygmSW50ZXJydXB0ZWRFeGVjdXRpb25FcnJvcjo6c19pbmZvKTsK K30KKworCiBjb25zdCBDbGFzc0luZm8gVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8g PSB7ICJUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3IiLCAmQmFzZTo6c19pbmZvLCAwLCAwIH07CiAK IFVTdHJpbmcgVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yOjp0b1N0cmluZyhFeGVjU3RhdGUqKSBj b25zdApAQCAtNTUsMTcgKzcxLDIyIEBAIFVTdHJpbmcgVGVybWluYXRlZEV4ZWN1dGlvbkVycm9y Ojp0b1N0cmkKICAgICByZXR1cm4gIkphdmFTY3JpcHQgZXhlY3V0aW9uIHRlcm1pbmF0ZWQuIjsK IH0KIAorSlNPYmplY3QqIGNyZWF0ZVRlcm1pbmF0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNHbG9i YWxEYXRhKiBnbG9iYWxEYXRhKQoreworICAgIHJldHVybiBUZXJtaW5hdGVkRXhlY3V0aW9uRXJy b3I6OmNyZWF0ZSgqZ2xvYmFsRGF0YSk7Cit9CiAKLUpTT2JqZWN0KiBjcmVhdGVJbnRlcnJ1cHRl ZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEpCitib29sIGlzVGVy bWluYXRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU09iamVjdCogb2JqZWN0KQogewotICAgIHJldHVy biBJbnRlcnJ1cHRlZEV4ZWN1dGlvbkVycm9yOjpjcmVhdGUoKmdsb2JhbERhdGEpOworICAgIHJl dHVybiBvYmplY3QtPmluaGVyaXRzKCZUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3I6OnNfaW5mbyk7 CiB9CiAKLUpTT2JqZWN0KiBjcmVhdGVUZXJtaW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9uKEpTR2xv YmFsRGF0YSogZ2xvYmFsRGF0YSkKK2Jvb2wgaXNUZXJtaW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9u KEpTVmFsdWUgdmFsdWUpCiB7Ci0gICAgcmV0dXJuIFRlcm1pbmF0ZWRFeGVjdXRpb25FcnJvcjo6 Y3JlYXRlKCpnbG9iYWxEYXRhKTsKKyAgICByZXR1cm4gdmFsdWUuaW5oZXJpdHMoJlRlcm1pbmF0 ZWRFeGVjdXRpb25FcnJvcjo6c19pbmZvKTsKIH0KIAorCiBKU09iamVjdCogY3JlYXRlU3RhY2tP dmVyZmxvd0Vycm9yKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICByZXR1cm4gY3JlYXRlUmFuZ2VF cnJvcihleGVjLCAiTWF4aW11bSBjYWxsIHN0YWNrIHNpemUgZXhjZWVkZWQuIik7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxwZXJzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCShy ZXZpc2lvbiA5NDkwOSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlv bkhlbHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsMTMgQEAKIG5hbWVzcGFjZSBK U0MgewogCiBKU09iamVjdCogY3JlYXRlSW50ZXJydXB0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNH bG9iYWxEYXRhKik7Citib29sIGlzSW50ZXJydXB0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNPYmpl Y3QqKTsKK2Jvb2wgaXNJbnRlcnJ1cHRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU1ZhbHVlKTsKKwog SlNPYmplY3QqIGNyZWF0ZVRlcm1pbmF0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNHbG9iYWxEYXRh Kik7Citib29sIGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihKU09iamVjdCopOworYm9v bCBpc1Rlcm1pbmF0ZWRFeGVjdXRpb25FeGNlcHRpb24oSlNWYWx1ZSk7CisKIEpTT2JqZWN0KiBj cmVhdGVTdGFja092ZXJmbG93RXJyb3IoRXhlY1N0YXRlKik7CiBKU09iamVjdCogY3JlYXRlU3Rh Y2tPdmVyZmxvd0Vycm9yKEpTR2xvYmFsT2JqZWN0Kik7CiBKU09iamVjdCogY3JlYXRlT3V0T2ZN ZW1vcnlFcnJvcihKU0dsb2JhbE9iamVjdCopOwpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTQ5 MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOCBAQAorMjAxMS0wOS0xMCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCisgICAg ICAgIEFkZCBpc0ludGVycnVwdGVkRXhlY3V0aW9uRXhjZXB0aW9uIGFuZCBpc1Rlcm1pbmF0ZWRF eGVjdXRpb25FeGNlcHRpb24gcHJlZGljYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc4OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpyZXBvcnRFeGNlcHRpb24pOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pT RXZlbnRMaXN0ZW5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0V2ZW50TGlzdGVuZXI6Omhh bmRsZUV2ZW50KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdENvbnRyb2xsZXI6OmV2YWx1YXRl KToKKyAgICAgICAgVXNlIHRoZSBuZXcgcHJlZGljYXRlcyBpbnN0ZWFkIG9mIHByb2JpbmcgdGhl IENsYXNzSW5mbyBkaXJlY3RseS4KKwogMjAxMS0wOS0wOSAgQ2hyaXMgTWFycmluICA8Y21hcnJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lIGRvZXNuJ3QgdGhy b3R0bGUgb24gTWFjCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRp bmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmlu ZGluZy5jcHAJKHJldmlzaW9uIDk0OTA5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNET01CaW5kaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxLDcgKzE3MSw3IEBAIGRvdWJs ZSB2YWx1ZVRvRGF0ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmEKIAogdm9pZCByZXBvcnRFeGNlcHRp b24oRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGV4Y2VwdGlvbikKIHsKLSAgICBpZiAoZXhjZXB0 aW9uLmluaGVyaXRzKCZUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3I6OnNfaW5mbykpCisgICAgaWYg KGlzVGVybWluYXRlZEV4ZWN1dGlvbkV4Y2VwdGlvbihleGNlcHRpb24pKQogICAgICAgICByZXR1 cm47CiAKICAgICBVU3RyaW5nIGVycm9yTWVzc2FnZSA9IGV4Y2VwdGlvbi50b1N0cmluZyhleGVj KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVy LmNwcAkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2 ZW50TGlzdGVuZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzQsNyArMTM0LDcgQEAgdm9pZCBK U0V2ZW50TGlzdGVuZXI6OmhhbmRsZUV2ZW50KFNjcmlwdAogCiAjaWYgRU5BQkxFKFdPUktFUlMp CiAgICAgICAgIGlmIChzY3JpcHRFeGVjdXRpb25Db250ZXh0LT5pc1dvcmtlckNvbnRleHQoKSkg ewotICAgICAgICAgICAgYm9vbCB0ZXJtaW5hdG9yQ2F1c2VkRXhjZXB0aW9uID0gKGV4ZWMtPmhh ZEV4Y2VwdGlvbigpICYmIGV4ZWMtPmV4Y2VwdGlvbigpLmluaGVyaXRzKCZUZXJtaW5hdGVkRXhl Y3V0aW9uRXJyb3I6OnNfaW5mbykpOworICAgICAgICAgICAgYm9vbCB0ZXJtaW5hdG9yQ2F1c2Vk RXhjZXB0aW9uID0gKGV4ZWMtPmhhZEV4Y2VwdGlvbigpICYmIGlzVGVybWluYXRlZEV4ZWN1dGlv bkV4Y2VwdGlvbihleGVjLT5leGNlcHRpb24oKSkpOwogICAgICAgICAgICAgaWYgKHRlcm1pbmF0 b3JDYXVzZWRFeGNlcHRpb24gfHwgZ2xvYmFsRGF0YS50ZXJtaW5hdG9yLnNob3VsZFRlcm1pbmF0 ZSgpKQogICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PFdvcmtlckNvbnRleHQqPihzY3JpcHRF eGVjdXRpb25Db250ZXh0KS0+c2NyaXB0KCktPmZvcmJpZEV4ZWN1dGlvbigpOwogICAgICAgICB9 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3Jp cHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gOTQ5MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMy LDEzICsxMzIsMTQgQEAgU2NyaXB0VmFsdWUgV29ya2VyU2NyaXB0Q29udHJvbGxlcjo6ZXZhbAog CiAgICAgRXhlY1N0YXRlKiBleGVjID0gbV93b3JrZXJDb250ZXh0V3JhcHBlci0+Z2xvYmFsRXhl YygpOwogCi0gICAgSlNWYWx1ZSBldmFsdWF0aW9uRXhjZXB0aW9uOwotCiAgICAgbV93b3JrZXJD b250ZXh0V3JhcHBlci0+Z2xvYmFsRGF0YSgpLnRpbWVvdXRDaGVja2VyLnN0YXJ0KCk7CisKKyAg ICBKU1ZhbHVlIGV2YWx1YXRpb25FeGNlcHRpb247CiAgICAgSlNWYWx1ZSByZXR1cm5WYWx1ZSA9 IEpTQzo6ZXZhbHVhdGUoZXhlYywgZXhlYy0+ZHluYW1pY0dsb2JhbE9iamVjdCgpLT5nbG9iYWxT Y29wZUNoYWluKCksIHNvdXJjZUNvZGUuanNTb3VyY2VDb2RlKCksIG1fd29ya2VyQ29udGV4dFdy YXBwZXIuZ2V0KCksICZldmFsdWF0aW9uRXhjZXB0aW9uKTsKKwogICAgIG1fd29ya2VyQ29udGV4 dFdyYXBwZXItPmdsb2JhbERhdGEoKS50aW1lb3V0Q2hlY2tlci5zdG9wKCk7CiAKLSAgICBpZiAo KGV2YWx1YXRpb25FeGNlcHRpb24gJiYgZXZhbHVhdGlvbkV4Y2VwdGlvbi5pbmhlcml0cygmVGVy bWluYXRlZEV4ZWN1dGlvbkVycm9yOjpzX2luZm8pKSB8fCAgbV93b3JrZXJDb250ZXh0V3JhcHBl ci0+Z2xvYmFsRGF0YSgpLnRlcm1pbmF0b3Iuc2hvdWxkVGVybWluYXRlKCkpIHsKKyAgICBpZiAo KGV2YWx1YXRpb25FeGNlcHRpb24gJiYgaXNUZXJtaW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9uKGV2 YWx1YXRpb25FeGNlcHRpb24pKSB8fCAgbV93b3JrZXJDb250ZXh0V3JhcHBlci0+Z2xvYmFsRGF0 YSgpLnRlcm1pbmF0b3Iuc2hvdWxkVGVybWluYXRlKCkpIHsKICAgICAgICAgZm9yYmlkRXhlY3V0 aW9uKCk7CiAgICAgICAgIHJldHVybiBTY3JpcHRWYWx1ZSgpOwogICAgIH0K