220918 2021-01-25 05:56:09 -0800 [WASM-References] Change default value for externref's tables from null to undefined 2021-01-26 13:46:27 -0800 1 1 1 Unclassified WebKit WebAssembly WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbezhetskov webkit-unassigned ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1722040 0 dbezhetskov 2021-01-25 05:56:09 -0800 [WASM-References] Change default value for externref's tables from null to undefined 1722042 1 418283 dbezhetskov 2021-01-25 06:00:24 -0800 Created attachment 418283 Patch 1722201 2 418283 ysuzuki 2021-01-25 12:33:30 -0800 Comment on attachment 418283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418283&action=review r=me with comments. > Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp:126 > + : callFrame->argument(1); Use `uncheckedArgument(1)` since we already checked. > Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp:99 > + defaultValue = callFrame->argument(1); Use `callFrame->uncheckedArgument(1);` since we already checked `callFrame->argumentCount() < 2` > Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp:137 > JSValue value = callFrame->argument(1); > - if (Options::useWebAssemblyReferences() && value.isUndefined()) > - value = jsNull(); > + if (Options::useWebAssemblyReferences() && callFrame->argumentCount() < 2) > + value = defaultValueForTable(table->table()->type()); This needs to be done after if (index >= table->length()) return throwVMRangeError(globalObject, throwScope, "WebAssembly.Table.prototype.set expects an integer less than the length of the table"_s); part. Can you move it, and add test for this? 1722501 3 418416 dbezhetskov 2021-01-26 07:17:06 -0800 Created attachment 418416 Patch 1722674 4 418416 ysuzuki 2021-01-26 12:52:25 -0800 Comment on attachment 418416 Patch r=me 1722675 5 418416 ysuzuki 2021-01-26 12:52:55 -0800 Comment on attachment 418416 Patch EWS is getting stuck. 1722708 6 ews-feeder 2021-01-26 13:45:25 -0800 Committed r271903: <https://trac.webkit.org/changeset/271903> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418416. 1722710 7 webkit-bug-importer 2021-01-26 13:46:27 -0800 <rdar://problem/73631096> 418283 2021-01-25 06:00:24 -0800 2021-01-26 07:16:58 -0800 Patch bug-220918-20210125170022.patch text/plain 10342 dbezhetskov U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YTExZGJlZmFjOTQ0MDY1MzhjMzdlNTU5ZGZhNmEyYjI4YWM2ZjE2Li5jYmEwMTMyNTM5MDZiNjY2 NmExZWY3OGY1MDUzYTQ1NjIzYzU3ZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMS0wMS0yNSAgRG1pdHJ5IEJlemhldHNrb3YgIDxkYmV6aGV0c2tvdkBp Z2FsaWEuY29tPgorCisgICAgICAgIFtXQVNNLVJlZmVyZW5jZXNdIENoYW5nZSBkZWZhdWx0IHZh bHVlIGZvciBleHRlcm5yZWYncyB0YWJsZXMgZnJvbSBudWxsIHRvIHVuZGVmaW5lZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTE4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHJlZmVyZW5j ZSB0eXBlcyB0ZXN0cyB0byBzYXRpc2Z5IHRoZSBzcGVjOgorICAgICAgICBFeHRlcm5yZWYncyB0 YWJsZXMgZGVmYXVsdCB2YWx1ZSBzaG91bGQgYmUgdW5kZWZpbmVkLgorCisgICAgICAgICogd2Fz bS9qcy9KU1dlYkFzc2VtYmx5SGVscGVycy5oOgorICAgICAgICAoSlNDOjpkZWZhdWx0VmFsdWVG b3JUYWJsZSk6CisgICAgICAgICogd2FzbS9qcy9XZWJBc3NlbWJseVRhYmxlQ29uc3RydWN0b3Iu Y3BwOgorICAgICAgICAoSlNDOjpKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04pOgorICAgICAgICAq IHdhc20vanMvV2ViQXNzZW1ibHlUYWJsZVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OkpT Q19ERUZJTkVfSE9TVF9GVU5DVElPTik6CisKIDIwMjEtMDEtMjMgIFl1c3VrZSBTdXp1a2kgIDx5 c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBEZWZlcnJlZFdvcmtUaW1lciBzaG91 bGQgY2xlYXIgcGVuZGluZyB0YXNrIGFmdGVyIHJ1bm5pbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlIZWxwZXJzLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SGVscGVycy5oCmluZGV4IGM2YTUyODBl NGU1MTIzMjgyYzQ2MTRjZjAxM2FmYzBhODM1ZjgxNzQuLmEzYzQ1YmFmNmI5YjIxYzQ4YTYyMWE0 ZWEzZGZmOWQxODk0NWQyMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L2pzL0pTV2ViQXNzZW1ibHlIZWxwZXJzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vanMvSlNXZWJBc3NlbWJseUhlbHBlcnMuaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUg IkpTQXJyYXlCdWZmZXJWaWV3LmgiCiAjaW5jbHVkZSAiSlNDSlNWYWx1ZS5oIgogI2luY2x1ZGUg IkpTU291cmNlQ29kZS5oIgorI2luY2x1ZGUgIldhc21Gb3JtYXQuaCIKICNpbmNsdWRlICJXZWJB c3NlbWJseUZ1bmN0aW9uLmgiCiAjaW5jbHVkZSAiV2ViQXNzZW1ibHlXcmFwcGVyRnVuY3Rpb24u aCIKIApAQCAtMTI3LDcgKzEyOCw2IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBpc1dlYkFzc2VtYmx5 SG9zdEZ1bmN0aW9uKFZNJiB2bSwgSlNWYWx1ZSB2YWx1ZSwgV2ViQXNzZW1ibHlGCiAgICAgcmV0 dXJuIGlzV2ViQXNzZW1ibHlIb3N0RnVuY3Rpb24odm0sIGpzQ2FzdDxKU09iamVjdCo+KHZhbHVl KSwgd2FzbUZ1bmN0aW9uLCB3YXNtV3JhcHBlckZ1bmN0aW9uKTsKIH0KIAotCiBBTFdBWVNfSU5M SU5FIGJvb2wgaXNXZWJBc3NlbWJseUhvc3RGdW5jdGlvbihWTSYgdm0sIEpTVmFsdWUgb2JqZWN0 KQogewogICAgIFdlYkFzc2VtYmx5RnVuY3Rpb24qIHVudXNlZDsKQEAgLTEzNSw2ICsxMzUsMTQg QEAgQUxXQVlTX0lOTElORSBib29sIGlzV2ViQXNzZW1ibHlIb3N0RnVuY3Rpb24oVk0mIHZtLCBK U1ZhbHVlIG9iamVjdCkKICAgICByZXR1cm4gaXNXZWJBc3NlbWJseUhvc3RGdW5jdGlvbih2bSwg b2JqZWN0LCB1bnVzZWQsIHVudXNlZDIpOwogfQogCitBTFdBWVNfSU5MSU5FIEpTVmFsdWUgZGVm YXVsdFZhbHVlRm9yVGFibGUoY29uc3QgV2FzbTo6VGFibGVFbGVtZW50VHlwZSB0YWJsZVR5cGUp Cit7CisgICAgaWYgKHRhYmxlVHlwZSA9PSBXYXNtOjpUYWJsZUVsZW1lbnRUeXBlOjpFeHRlcm5y ZWYpCisgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgIEFTU0VSVCh0YWJsZVR5cGUg PT0gV2FzbTo6VGFibGVFbGVtZW50VHlwZTo6RnVuY3JlZik7CisgICAgcmV0dXJuIGpzTnVsbCgp OworfQorCiB9IC8vIG5hbWVzcGFjZSBKU0MKIAogI2VuZGlmIC8vIEVOQUJMRShXRUJBU1NFTUJM WSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5 VGFibGVDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJB c3NlbWJseVRhYmxlQ29uc3RydWN0b3IuY3BwCmluZGV4IGI3OThkNmYwZDcwMDc1ZTkxYTgyZWY4 NDk1MTU2MDliMzg2NjFmMWIuLjE4YWEzODg5MjU1YzA3ZGJkNjBjMDIyMTc2ZTcxODA5ZjczYThk NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5 VGFibGVDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMv V2ViQXNzZW1ibHlUYWJsZUNvbnN0cnVjdG9yLmNwcApAQCAtMTIwLDE0ICsxMjAsMTYgQEAgSlND X0RFRklORV9IT1NUX0ZVTkNUSU9OKGNvbnN0cnVjdEpTV2ViQXNzZW1ibHlUYWJsZSwgKEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmoKICAgICBKU1dlYkFzc2VtYmx5VGFibGUqIGpzV2ViQXNzZW1i bHlUYWJsZSA9IEpTV2ViQXNzZW1ibHlUYWJsZTo6dHJ5Q3JlYXRlKGdsb2JhbE9iamVjdCwgdm0s IHdlYkFzc2VtYmx5VGFibGVTdHJ1Y3R1cmUsIHdhc21UYWJsZS5yZWxlYXNlTm9uTnVsbCgpKTsK ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOwog Ci0gICAgSlNWYWx1ZSBkZWZhdWx0VmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDEpOwotICAg IGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSAmJiAhZGVmYXVsdFZhbHVl LmlzVW5kZWZpbmVkKCkpIHsKKyAgICBpZiAoT3B0aW9uczo6dXNlV2ViQXNzZW1ibHlSZWZlcmVu Y2VzKCkpIHsKKyAgICAgICAgSlNWYWx1ZSBkZWZhdWx0VmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3Vt ZW50Q291bnQoKSA8IDIKKyAgICAgICAgICAgID8gZGVmYXVsdFZhbHVlRm9yVGFibGUoanNXZWJB c3NlbWJseVRhYmxlLT50YWJsZSgpLT50eXBlKCkpCisgICAgICAgICAgICA6IGNhbGxGcmFtZS0+ YXJndW1lbnQoMSk7CiAgICAgICAgIFdlYkFzc2VtYmx5RnVuY3Rpb24qIHdhc21GdW5jdGlvbiA9 IG51bGxwdHI7CiAgICAgICAgIFdlYkFzc2VtYmx5V3JhcHBlckZ1bmN0aW9uKiB3YXNtV3JhcHBl ckZ1bmN0aW9uID0gbnVsbHB0cjsKLSAgICAgICAgaWYgKGpzV2ViQXNzZW1ibHlUYWJsZS0+dGFi bGUoKS0+aXNGdW5jcmVmVGFibGUoKSAmJiAoIWRlZmF1bHRWYWx1ZS5pc051bGwoKSAmJiAhaXNX ZWJBc3NlbWJseUhvc3RGdW5jdGlvbih2bSwgZGVmYXVsdFZhbHVlLCB3YXNtRnVuY3Rpb24sIHdh c21XcmFwcGVyRnVuY3Rpb24pKSkKKyAgICAgICAgaWYgKGpzV2ViQXNzZW1ibHlUYWJsZS0+dGFi bGUoKS0+aXNGdW5jcmVmVGFibGUoKSAmJiAhZGVmYXVsdFZhbHVlLmlzTnVsbCgpICYmICFpc1dl YkFzc2VtYmx5SG9zdEZ1bmN0aW9uKHZtLCBkZWZhdWx0VmFsdWUsIHdhc21GdW5jdGlvbiwgd2Fz bVdyYXBwZXJGdW5jdGlvbikpCiAgICAgICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihn bG9iYWxPYmplY3QsIHRocm93U2NvcGUsICJXZWJBc3NlbWJseS5UYWJsZS5wcm90b3R5cGUuY29u c3RydWN0b3IgZXhwZWN0cyB0aGUgc2Vjb25kIGFyZ3VtZW50IHRvIGJlIG51bGwgb3IgYW4gaW5z dGFuY2Ugb2YgV2ViQXNzZW1ibHkuRnVuY3Rpb24iX3MpOwogICAgICAgICBmb3IgKHVpbnQzMl90 IHRhYmxlSW5kZXggPSAwOyB0YWJsZUluZGV4IDwgaW5pdGlhbDsgKyt0YWJsZUluZGV4KSB7Ci0g ICAgICAgICAgICBpZiAoanNXZWJBc3NlbWJseVRhYmxlLT50YWJsZSgpLT5pc0Z1bmNyZWZUYWJs ZSgpKQorICAgICAgICAgICAgaWYgKGpzV2ViQXNzZW1ibHlUYWJsZS0+dGFibGUoKS0+aXNGdW5j cmVmVGFibGUoKSAmJiB3YXNtRnVuY3Rpb24pCiAgICAgICAgICAgICAgICAganNXZWJBc3NlbWJs eVRhYmxlLT5zZXQodGFibGVJbmRleCwgd2FzbUZ1bmN0aW9uKTsKICAgICAgICAgICAgIGlmIChq c1dlYkFzc2VtYmx5VGFibGUtPnRhYmxlKCktPmlzRXh0ZXJucmVmVGFibGUoKSkKICAgICAgICAg ICAgICAgICBqc1dlYkFzc2VtYmx5VGFibGUtPnNldCh0YWJsZUluZGV4LCBkZWZhdWx0VmFsdWUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlU YWJsZVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3Nl bWJseVRhYmxlUHJvdG90eXBlLmNwcAppbmRleCBkYTdiYjZiNjA1NWVlOTZmNWQyOTdiMTU4OGM2 ZWNiM2JkMzcyMDYxLi5kODQ4ZmEzMDRkMzg5MTllOTg4NDM5MWRkNzYwMTM2OGE4MGQ4ZmExIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseVRhYmxl UHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3Nl bWJseVRhYmxlUHJvdG90eXBlLmNwcApAQCAtOTIsOCArOTIsMTIgQEAgSlNDX0RFRklORV9IT1NU X0ZVTkNUSU9OKHdlYkFzc2VtYmx5VGFibGVQcm90b0Z1bmNHcm93LCAoSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE8KICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIGVuY29kZWRKU1Zh bHVlKCkpOwogCiAgICAgSlNWYWx1ZSBkZWZhdWx0VmFsdWUgPSBqc051bGwoKTsKLSAgICBpZiAo T3B0aW9uczo6dXNlV2ViQXNzZW1ibHlSZWZlcmVuY2VzKCkgJiYgY2FsbEZyYW1lLT5hcmd1bWVu dENvdW50KCkgPiAxKQotICAgICAgICBkZWZhdWx0VmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3VtZW50 KDEpOworICAgIGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSkgeworICAg ICAgICBpZiAoY2FsbEZyYW1lLT5hcmd1bWVudENvdW50KCkgPCAyKQorICAgICAgICAgICAgZGVm YXVsdFZhbHVlID0gZGVmYXVsdFZhbHVlRm9yVGFibGUodGFibGUtPnRhYmxlKCktPnR5cGUoKSk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRlZmF1bHRWYWx1ZSA9IGNhbGxGcmFtZS0+YXJn dW1lbnQoMSk7CisgICAgfQogICAgIGlmICh0YWJsZS0+dGFibGUoKS0+aXNGdW5jcmVmVGFibGUo KSAmJiAhZGVmYXVsdFZhbHVlLmlzTnVsbCgpICYmICFpc1dlYkFzc2VtYmx5SG9zdEZ1bmN0aW9u KHZtLCBkZWZhdWx0VmFsdWUpKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihnbG9i YWxPYmplY3QsIHRocm93U2NvcGUsICJXZWJBc3NlbWJseS5UYWJsZS5wcm90b3R5cGUuZ3JvdyBl eHBlY3RzIHRoZSBzZWNvbmQgYXJndW1lbnQgdG8gYmUgbnVsbCBvciBhbiBpbnN0YW5jZSBvZiBX ZWJBc3NlbWJseS5GdW5jdGlvbiJfcyk7CiAgICAgdWludDMyX3Qgb2xkTGVuZ3RoID0gdGFibGUt Pmxlbmd0aCgpOwpAQCAtMTI5LDggKzEzMyw4IEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTih3 ZWJBc3NlbWJseVRhYmxlUHJvdG9GdW5jU2V0LCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iCiAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKIAog ICAgIEpTVmFsdWUgdmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDEpOwotICAgIGlmIChPcHRp b25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSAmJiB2YWx1ZS5pc1VuZGVmaW5lZCgpKQot ICAgICAgICB2YWx1ZSA9IGpzTnVsbCgpOworICAgIGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJs eVJlZmVyZW5jZXMoKSAmJiBjYWxsRnJhbWUtPmFyZ3VtZW50Q291bnQoKSA8IDIpCisgICAgICAg IHZhbHVlID0gZGVmYXVsdFZhbHVlRm9yVGFibGUodGFibGUtPnRhYmxlKCktPnR5cGUoKSk7CiAK ICAgICB1aW50MzJfdCBpbmRleCA9IHRvTm9uV3JhcHBpbmdVaW50MzIoZ2xvYmFsT2JqZWN0LCBj YWxsRnJhbWUtPmFyZ3VtZW50KDApKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2Nv cGUsIGVuY29kZWRKU1ZhbHVlKCkpOwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9K U1Rlc3RzL0NoYW5nZUxvZwppbmRleCAwYjJiYjM5OGE5Mjk0NWNiOTRmNTYyOWViMjk5NzAyN2Y2 NDY1MDM0Li4zMjE2NjI1Y2ZkYjIyOTQxMjk3YjQ0ZjY3ZmFkMWM4MDY0M2I4NTM1IDEwMDY0NAot LS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDIxLTAxLTI1ICBEbWl0cnkgQmV6aGV0c2tvdiAgPGRiZXpoZXRza292QGlnYWxp YS5jb20+CisKKyAgICAgICAgW1dBU00tUmVmZXJlbmNlc10gQ2hhbmdlIGRlZmF1bHQgdmFsdWUg Zm9yIGV4dGVybnJlZidzIHRhYmxlcyBmcm9tIG51bGwgdG8gdW5kZWZpbmVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5MTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NvcmRpbmcgdG8gdGhlIHJl ZmVyZW5jZSB0eXBlcyBzcGVjCisgICAgICAgIGh0dHBzOi8vd2ViYXNzZW1ibHkuZ2l0aHViLmlv L3JlZmVyZW5jZS10eXBlcy9qcy1hcGkvI2RlZmF1bHR2YWx1ZXkKKyAgICAgICAgd2Ugc2hvdWxk IHVzZSB1bmRlZmluZWQgYXMgYSBkZWZhdWx0IHZhbHVlIGluIFRhYmxlIGN0b3IsIHNldCBhbmQg Z3JvdworICAgICAgICBtZXRob2RzLCBzbyB0aGlzIHBhdGNoIHJlcGxhY2VzIHByZXZpb3VzIG51 bGwgZGVmYXVsdCB2YWx1ZSBmb3IKKyAgICAgICAgZXh0ZXJucmVmJ3MgdGFibGUgdG8gdW5kZWZp bmVkLgorCisgICAgICAgICogd2FzbS9yZWZlcmVuY2VzL2V4dGVybnJlZl90YWJsZV9pbXBvcnQu anM6CisgICAgICAgIChzdHJpbmdfYXBwZWFyZWRfaGVyZS5mdWxsR0MuYXNzZXJ0LmVxLjEuZXhw b3J0cy5nZXRfdGJsKToKKyAgICAgICAgKiB3YXNtL3JlZmVyZW5jZXMvdGFibGVfanNfYXBpLmpz OgorICAgICAgICAodGVzdFRhYmxlR3Jvd0ZvckV4dGVybnJlZlRhYmxlcyk6CisgICAgICAgICog d2FzbS9yZWZlcmVuY2VzL3RhYmxlX21pc2MuanM6CisKIDIwMjEtMDEtMjEgIFl1c3VrZSBTdXp1 a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBKU1Byb21pc2Ugc2hvdWxk IG5vdCBwcm9wYWdhdGUgVGVybWluYXRlZEV4ZWN1dGlvbkVycm9yCmRpZmYgLS1naXQgYS9KU1Rl c3RzL3dhc20vcmVmZXJlbmNlcy9leHRlcm5yZWZfdGFibGVfaW1wb3J0LmpzIGIvSlNUZXN0cy93 YXNtL3JlZmVyZW5jZXMvZXh0ZXJucmVmX3RhYmxlX2ltcG9ydC5qcwppbmRleCAxNDNkZWY2MDcw ODM0NzcxMWNjZTRiM2FiMzZkODZlOWVlYTcwMmM1Li4wNjU3MTcyMTkyOTNlNTI5ZDlkOTc3Yjc0 NjQ4NGY1MTM2NWFkMDVkIDEwMDY0NAotLS0gYS9KU1Rlc3RzL3dhc20vcmVmZXJlbmNlcy9leHRl cm5yZWZfdGFibGVfaW1wb3J0LmpzCisrKyBiL0pTVGVzdHMvd2FzbS9yZWZlcmVuY2VzL2V4dGVy bnJlZl90YWJsZV9pbXBvcnQuanMKQEAgLTQ4LDggKzQ4LDggQEAgaW1wb3J0IEJ1aWxkZXIgZnJv bSAnLi4vQnVpbGRlci5qcyc7CiAgICAgY29uc3QgJDEgPSBtYWtlSW1wb3J0KCkKICAgICBmdWxs R0MoKQogCi0gICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMuZ2V0X3RibCgpLCBudWxsKQotICAgIGFz c2VydC5lcSgkMS5leHBvcnRzLnRibF9pc19udWxsKCksIDEpCisgICAgYXNzZXJ0LmVxKCQxLmV4 cG9ydHMuZ2V0X3RibCgpLCB1bmRlZmluZWQpCisgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJs X2lzX251bGwoKSwgMCkKIAogICAgICQxLmV4cG9ydHMuc2V0X3RibCgiaGkiKQogICAgIGZ1bGxH QygpCkBAIC01Nyw3ICs1Nyw3IEBAIGltcG9ydCBCdWlsZGVyIGZyb20gJy4uL0J1aWxkZXIuanMn OwogICAgIGFzc2VydC5lcSgkMS5leHBvcnRzLnRibF9pc19udWxsKCksIDApCiAKICAgICBhc3Nl cnQuZXEoJDEuZXhwb3J0cy50YmwuZ2V0KDApLCAiaGkiKQotICAgIGFzc2VydC5lcSgkMS5leHBv cnRzLnRibC5nZXQoMSksIG51bGwpCisgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsLmdldCgx KSwgdW5kZWZpbmVkKQogCiAgICAgJDEuZXhwb3J0cy50Ymwuc2V0KDAsIHsgdGVzdDogInRlc3Qi IH0pOwogICAgIGZ1bGxHQygpCkBAIC0xNjMsNyArMTYzLDcgQEAgaW1wb3J0IEJ1aWxkZXIgZnJv bSAnLi4vQnVpbGRlci5qcyc7CiAgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsX2lzX251bGwo KSwgMCkKIAogICAgIGFzc2VydC5lcSgkMS5leHBvcnRzLnRibC5nZXQoMCksICJoaSIpCi0gICAg YXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsLmdldCgxKSwgbnVsbCkKKyAgICBhc3NlcnQuZXEoJDEu ZXhwb3J0cy50YmwuZ2V0KDEpLCB1bmRlZmluZWQpCiAKICAgICAkMS5leHBvcnRzLnRibC5zZXQo MCwgeyB0ZXN0OiAidGVzdCIgfSk7CiAgICAgZnVsbEdDKCkKZGlmZiAtLWdpdCBhL0pTVGVzdHMv d2FzbS9yZWZlcmVuY2VzL3RhYmxlX2pzX2FwaS5qcyBiL0pTVGVzdHMvd2FzbS9yZWZlcmVuY2Vz L3RhYmxlX2pzX2FwaS5qcwppbmRleCA1ZWFjZjM1ZTgwMDc3ZTMyZGJjN2I5OGMwZWZkOTAyY2I0 ZWU1MzVjLi44MDFhZjQyOWM3MzlkMzQyNWIwNTgxZTU0NGU3OGVkODU1YWRjODk5IDEwMDY0NAot LS0gYS9KU1Rlc3RzL3dhc20vcmVmZXJlbmNlcy90YWJsZV9qc19hcGkuanMKKysrIGIvSlNUZXN0 cy93YXNtL3JlZmVyZW5jZXMvdGFibGVfanNfYXBpLmpzCkBAIC0xNCw2ICsxNCwxMiBAQCBmdW5j dGlvbiB0ZXN0VGFibGVHcm93Rm9yRXh0ZXJucmVmVGFibGVzKCkgewogICBhc3NlcnQuZXEodGFi bGUuZ2V0KDEpLmNhbG9yaWVzLCBjYWxvcmllcyk7CiAgIGFzc2VydC5lcSh0YWJsZS5nZXQoMiku Y2Fsb3JpZXMsIGNhbG9yaWVzKTsKICAgYXNzZXJ0LmVxKHRhYmxlLmdldCgzKS5jYWxvcmllcywg Y2Fsb3JpZXMpOworCisgIHRhYmxlLmdyb3coMyk7CisgIGFzc2VydC5lcSh0YWJsZS5sZW5ndGgs IDcpOworICBhc3NlcnQuZXEodGFibGUuZ2V0KDQpLCB1bmRlZmluZWQpOworICBhc3NlcnQuZXEo dGFibGUuZ2V0KDUpLCB1bmRlZmluZWQpOworICBhc3NlcnQuZXEodGFibGUuZ2V0KDYpLCB1bmRl ZmluZWQpOwogfQogCiBhc3luYyBmdW5jdGlvbiB0ZXN0VGFibGVHcm93Rm9yRnVuY3JlZlRhYmxl cygpIHsKQEAgLTU2LDcgKzYyLDcgQEAgZnVuY3Rpb24gdGVzdFRhYmxlU2V0Rm9yRXh0ZXJucmVm VGFibGVzKCkgewogICBhc3NlcnQuZXEodGFibGUuZ2V0KDApLmNhbG9yaWVzLCBjYWxvcmllcyk7 CiAKICAgdGFibGUuc2V0KDApOwotICBhc3NlcnQuZXEodGFibGUuZ2V0KDApLCBudWxsKTsKKyAg YXNzZXJ0LmVxKHRhYmxlLmdldCgwKSwgdW5kZWZpbmVkKTsKIH0KIAogYXN5bmMgZnVuY3Rpb24g dGVzdFRhYmxlU2V0Rm9yRnVuY3JlZlRhYmxlcygpIHsKZGlmZiAtLWdpdCBhL0pTVGVzdHMvd2Fz bS9yZWZlcmVuY2VzL3RhYmxlX21pc2MuanMgYi9KU1Rlc3RzL3dhc20vcmVmZXJlbmNlcy90YWJs ZV9taXNjLmpzCmluZGV4IDAzOWU4M2I5NzQwZTVlMmYzMzQyOGYxYjg4ODNhYzNlYmZhMmVkOTcu LmI0NTNlN2VkMDY0MzFjY2M4NTZmYmFhYzM1YzQ2ZGNjYjc2ZWM3MzAgMTAwNjQ0Ci0tLSBhL0pT VGVzdHMvd2FzbS9yZWZlcmVuY2VzL3RhYmxlX21pc2MuanMKKysrIGIvSlNUZXN0cy93YXNtL3Jl ZmVyZW5jZXMvdGFibGVfbWlzYy5qcwpAQCAtMjUsNyArMjUsNyBAQCBpbXBvcnQgQnVpbGRlciBm cm9tICcuLi9CdWlsZGVyLmpzJzsKICAgICBhc3NlcnQuZXEoJDEuZXhwb3J0cy50YmwuZ3Jvdyg1 KSwgMjApCiAgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsX3NpemUoKSwgMjUpCiAgICAgYXNz ZXJ0LmVxKCQxLmV4cG9ydHMudGJsLmdldCgwKSwgbnVsbCkKLSAgICBhc3NlcnQuZXEoJDEuZXhw b3J0cy50YmwuZ2V0KDI0KSwgbnVsbCkKKyAgICBhc3NlcnQuZXEoJDEuZXhwb3J0cy50YmwuZ2V0 KDI0KSwgdW5kZWZpbmVkKQogfQogCiBhc3NlcnQudGhyb3dzKCgpID0+IG5ldyBXZWJBc3NlbWJs eS5Nb2R1bGUoKG5ldyBCdWlsZGVyKCkpCg== 418416 2021-01-26 07:17:06 -0800 2021-01-26 13:45:26 -0800 Patch bug-220918-20210126181704.patch text/plain 11135 dbezhetskov U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YTExZGJlZmFjOTQ0MDY1MzhjMzdlNTU5ZGZhNmEyYjI4YWM2ZjE2Li5jYmEwMTMyNTM5MDZiNjY2 NmExZWY3OGY1MDUzYTQ1NjIzYzU3ZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMS0wMS0yNSAgRG1pdHJ5IEJlemhldHNrb3YgIDxkYmV6aGV0c2tvdkBp Z2FsaWEuY29tPgorCisgICAgICAgIFtXQVNNLVJlZmVyZW5jZXNdIENoYW5nZSBkZWZhdWx0IHZh bHVlIGZvciBleHRlcm5yZWYncyB0YWJsZXMgZnJvbSBudWxsIHRvIHVuZGVmaW5lZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTE4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHJlZmVyZW5j ZSB0eXBlcyB0ZXN0cyB0byBzYXRpc2Z5IHRoZSBzcGVjOgorICAgICAgICBFeHRlcm5yZWYncyB0 YWJsZXMgZGVmYXVsdCB2YWx1ZSBzaG91bGQgYmUgdW5kZWZpbmVkLgorCisgICAgICAgICogd2Fz bS9qcy9KU1dlYkFzc2VtYmx5SGVscGVycy5oOgorICAgICAgICAoSlNDOjpkZWZhdWx0VmFsdWVG b3JUYWJsZSk6CisgICAgICAgICogd2FzbS9qcy9XZWJBc3NlbWJseVRhYmxlQ29uc3RydWN0b3Iu Y3BwOgorICAgICAgICAoSlNDOjpKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04pOgorICAgICAgICAq IHdhc20vanMvV2ViQXNzZW1ibHlUYWJsZVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OkpT Q19ERUZJTkVfSE9TVF9GVU5DVElPTik6CisKIDIwMjEtMDEtMjMgIFl1c3VrZSBTdXp1a2kgIDx5 c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBEZWZlcnJlZFdvcmtUaW1lciBzaG91 bGQgY2xlYXIgcGVuZGluZyB0YXNrIGFmdGVyIHJ1bm5pbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlIZWxwZXJzLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SGVscGVycy5oCmluZGV4IGM2YTUyODBl NGU1MTIzMjgyYzQ2MTRjZjAxM2FmYzBhODM1ZjgxNzQuLmEzYzQ1YmFmNmI5YjIxYzQ4YTYyMWE0 ZWEzZGZmOWQxODk0NWQyMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L2pzL0pTV2ViQXNzZW1ibHlIZWxwZXJzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vanMvSlNXZWJBc3NlbWJseUhlbHBlcnMuaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUg IkpTQXJyYXlCdWZmZXJWaWV3LmgiCiAjaW5jbHVkZSAiSlNDSlNWYWx1ZS5oIgogI2luY2x1ZGUg IkpTU291cmNlQ29kZS5oIgorI2luY2x1ZGUgIldhc21Gb3JtYXQuaCIKICNpbmNsdWRlICJXZWJB c3NlbWJseUZ1bmN0aW9uLmgiCiAjaW5jbHVkZSAiV2ViQXNzZW1ibHlXcmFwcGVyRnVuY3Rpb24u aCIKIApAQCAtMTI3LDcgKzEyOCw2IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBpc1dlYkFzc2VtYmx5 SG9zdEZ1bmN0aW9uKFZNJiB2bSwgSlNWYWx1ZSB2YWx1ZSwgV2ViQXNzZW1ibHlGCiAgICAgcmV0 dXJuIGlzV2ViQXNzZW1ibHlIb3N0RnVuY3Rpb24odm0sIGpzQ2FzdDxKU09iamVjdCo+KHZhbHVl KSwgd2FzbUZ1bmN0aW9uLCB3YXNtV3JhcHBlckZ1bmN0aW9uKTsKIH0KIAotCiBBTFdBWVNfSU5M SU5FIGJvb2wgaXNXZWJBc3NlbWJseUhvc3RGdW5jdGlvbihWTSYgdm0sIEpTVmFsdWUgb2JqZWN0 KQogewogICAgIFdlYkFzc2VtYmx5RnVuY3Rpb24qIHVudXNlZDsKQEAgLTEzNSw2ICsxMzUsMTQg QEAgQUxXQVlTX0lOTElORSBib29sIGlzV2ViQXNzZW1ibHlIb3N0RnVuY3Rpb24oVk0mIHZtLCBK U1ZhbHVlIG9iamVjdCkKICAgICByZXR1cm4gaXNXZWJBc3NlbWJseUhvc3RGdW5jdGlvbih2bSwg b2JqZWN0LCB1bnVzZWQsIHVudXNlZDIpOwogfQogCitBTFdBWVNfSU5MSU5FIEpTVmFsdWUgZGVm YXVsdFZhbHVlRm9yVGFibGUoY29uc3QgV2FzbTo6VGFibGVFbGVtZW50VHlwZSB0YWJsZVR5cGUp Cit7CisgICAgaWYgKHRhYmxlVHlwZSA9PSBXYXNtOjpUYWJsZUVsZW1lbnRUeXBlOjpFeHRlcm5y ZWYpCisgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgIEFTU0VSVCh0YWJsZVR5cGUg PT0gV2FzbTo6VGFibGVFbGVtZW50VHlwZTo6RnVuY3JlZik7CisgICAgcmV0dXJuIGpzTnVsbCgp OworfQorCiB9IC8vIG5hbWVzcGFjZSBKU0MKIAogI2VuZGlmIC8vIEVOQUJMRShXRUJBU1NFTUJM WSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5 VGFibGVDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJB c3NlbWJseVRhYmxlQ29uc3RydWN0b3IuY3BwCmluZGV4IGI3OThkNmYwZDcwMDc1ZTkxYTgyZWY4 NDk1MTU2MDliMzg2NjFmMWIuLjRmY2JlNWNlYmYzNGRlN2NlNzUyYjZkMjFhNWFlM2YzMmI5M2Mz MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5 VGFibGVDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMv V2ViQXNzZW1ibHlUYWJsZUNvbnN0cnVjdG9yLmNwcApAQCAtMTIwLDE0ICsxMjAsMTYgQEAgSlND X0RFRklORV9IT1NUX0ZVTkNUSU9OKGNvbnN0cnVjdEpTV2ViQXNzZW1ibHlUYWJsZSwgKEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmoKICAgICBKU1dlYkFzc2VtYmx5VGFibGUqIGpzV2ViQXNzZW1i bHlUYWJsZSA9IEpTV2ViQXNzZW1ibHlUYWJsZTo6dHJ5Q3JlYXRlKGdsb2JhbE9iamVjdCwgdm0s IHdlYkFzc2VtYmx5VGFibGVTdHJ1Y3R1cmUsIHdhc21UYWJsZS5yZWxlYXNlTm9uTnVsbCgpKTsK ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOwog Ci0gICAgSlNWYWx1ZSBkZWZhdWx0VmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDEpOwotICAg IGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSAmJiAhZGVmYXVsdFZhbHVl LmlzVW5kZWZpbmVkKCkpIHsKKyAgICBpZiAoT3B0aW9uczo6dXNlV2ViQXNzZW1ibHlSZWZlcmVu Y2VzKCkpIHsKKyAgICAgICAgSlNWYWx1ZSBkZWZhdWx0VmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3Vt ZW50Q291bnQoKSA8IDIKKyAgICAgICAgICAgID8gZGVmYXVsdFZhbHVlRm9yVGFibGUoanNXZWJB c3NlbWJseVRhYmxlLT50YWJsZSgpLT50eXBlKCkpCisgICAgICAgICAgICA6IGNhbGxGcmFtZS0+ dW5jaGVja2VkQXJndW1lbnQoMSk7CiAgICAgICAgIFdlYkFzc2VtYmx5RnVuY3Rpb24qIHdhc21G dW5jdGlvbiA9IG51bGxwdHI7CiAgICAgICAgIFdlYkFzc2VtYmx5V3JhcHBlckZ1bmN0aW9uKiB3 YXNtV3JhcHBlckZ1bmN0aW9uID0gbnVsbHB0cjsKLSAgICAgICAgaWYgKGpzV2ViQXNzZW1ibHlU YWJsZS0+dGFibGUoKS0+aXNGdW5jcmVmVGFibGUoKSAmJiAoIWRlZmF1bHRWYWx1ZS5pc051bGwo KSAmJiAhaXNXZWJBc3NlbWJseUhvc3RGdW5jdGlvbih2bSwgZGVmYXVsdFZhbHVlLCB3YXNtRnVu Y3Rpb24sIHdhc21XcmFwcGVyRnVuY3Rpb24pKSkKKyAgICAgICAgaWYgKGpzV2ViQXNzZW1ibHlU YWJsZS0+dGFibGUoKS0+aXNGdW5jcmVmVGFibGUoKSAmJiAhZGVmYXVsdFZhbHVlLmlzTnVsbCgp ICYmICFpc1dlYkFzc2VtYmx5SG9zdEZ1bmN0aW9uKHZtLCBkZWZhdWx0VmFsdWUsIHdhc21GdW5j dGlvbiwgd2FzbVdyYXBwZXJGdW5jdGlvbikpCiAgICAgICAgICAgICByZXR1cm4gdGhyb3dWTVR5 cGVFcnJvcihnbG9iYWxPYmplY3QsIHRocm93U2NvcGUsICJXZWJBc3NlbWJseS5UYWJsZS5wcm90 b3R5cGUuY29uc3RydWN0b3IgZXhwZWN0cyB0aGUgc2Vjb25kIGFyZ3VtZW50IHRvIGJlIG51bGwg b3IgYW4gaW5zdGFuY2Ugb2YgV2ViQXNzZW1ibHkuRnVuY3Rpb24iX3MpOwogICAgICAgICBmb3Ig KHVpbnQzMl90IHRhYmxlSW5kZXggPSAwOyB0YWJsZUluZGV4IDwgaW5pdGlhbDsgKyt0YWJsZUlu ZGV4KSB7Ci0gICAgICAgICAgICBpZiAoanNXZWJBc3NlbWJseVRhYmxlLT50YWJsZSgpLT5pc0Z1 bmNyZWZUYWJsZSgpKQorICAgICAgICAgICAgaWYgKGpzV2ViQXNzZW1ibHlUYWJsZS0+dGFibGUo KS0+aXNGdW5jcmVmVGFibGUoKSAmJiB3YXNtRnVuY3Rpb24pCiAgICAgICAgICAgICAgICAganNX ZWJBc3NlbWJseVRhYmxlLT5zZXQodGFibGVJbmRleCwgd2FzbUZ1bmN0aW9uKTsKICAgICAgICAg ICAgIGlmIChqc1dlYkFzc2VtYmx5VGFibGUtPnRhYmxlKCktPmlzRXh0ZXJucmVmVGFibGUoKSkK ICAgICAgICAgICAgICAgICBqc1dlYkFzc2VtYmx5VGFibGUtPnNldCh0YWJsZUluZGV4LCBkZWZh dWx0VmFsdWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2Vi QXNzZW1ibHlUYWJsZVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9q cy9XZWJBc3NlbWJseVRhYmxlUHJvdG90eXBlLmNwcAppbmRleCBkYTdiYjZiNjA1NWVlOTZmNWQy OTdiMTU4OGM2ZWNiM2JkMzcyMDYxLi42ZmMxYmVkODJiM2YwNWJlYjM5MjI3NTcyMmYyZjFlZWY2 MDdhMGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3Nl bWJseVRhYmxlUHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9q cy9XZWJBc3NlbWJseVRhYmxlUHJvdG90eXBlLmNwcApAQCAtOTIsOCArOTIsMTIgQEAgSlNDX0RF RklORV9IT1NUX0ZVTkNUSU9OKHdlYkFzc2VtYmx5VGFibGVQcm90b0Z1bmNHcm93LCAoSlNHbG9i YWxPYmplY3QqIGdsb2JhbE8KICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIGVu Y29kZWRKU1ZhbHVlKCkpOwogCiAgICAgSlNWYWx1ZSBkZWZhdWx0VmFsdWUgPSBqc051bGwoKTsK LSAgICBpZiAoT3B0aW9uczo6dXNlV2ViQXNzZW1ibHlSZWZlcmVuY2VzKCkgJiYgY2FsbEZyYW1l LT5hcmd1bWVudENvdW50KCkgPiAxKQotICAgICAgICBkZWZhdWx0VmFsdWUgPSBjYWxsRnJhbWUt PmFyZ3VtZW50KDEpOworICAgIGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMo KSkgeworICAgICAgICBpZiAoY2FsbEZyYW1lLT5hcmd1bWVudENvdW50KCkgPCAyKQorICAgICAg ICAgICAgZGVmYXVsdFZhbHVlID0gZGVmYXVsdFZhbHVlRm9yVGFibGUodGFibGUtPnRhYmxlKCkt PnR5cGUoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRlZmF1bHRWYWx1ZSA9IGNhbGxG cmFtZS0+dW5jaGVja2VkQXJndW1lbnQoMSk7CisgICAgfQogICAgIGlmICh0YWJsZS0+dGFibGUo KS0+aXNGdW5jcmVmVGFibGUoKSAmJiAhZGVmYXVsdFZhbHVlLmlzTnVsbCgpICYmICFpc1dlYkFz c2VtYmx5SG9zdEZ1bmN0aW9uKHZtLCBkZWZhdWx0VmFsdWUpKQogICAgICAgICByZXR1cm4gdGhy b3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHRocm93U2NvcGUsICJXZWJBc3NlbWJseS5UYWJs ZS5wcm90b3R5cGUuZ3JvdyBleHBlY3RzIHRoZSBzZWNvbmQgYXJndW1lbnQgdG8gYmUgbnVsbCBv ciBhbiBpbnN0YW5jZSBvZiBXZWJBc3NlbWJseS5GdW5jdGlvbiJfcyk7CiAgICAgdWludDMyX3Qg b2xkTGVuZ3RoID0gdGFibGUtPmxlbmd0aCgpOwpAQCAtMTI4LDE2ICsxMzIsMTYgQEAgSlNDX0RF RklORV9IT1NUX0ZVTkNUSU9OKHdlYkFzc2VtYmx5VGFibGVQcm90b0Z1bmNTZXQsIChKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2IKICAgICBKU1dlYkFzc2VtYmx5VGFibGUqIHRhYmxlID0gZ2V0VGFi bGUoZ2xvYmFsT2JqZWN0LCB2bSwgY2FsbEZyYW1lLT50aGlzVmFsdWUoKSk7CiAgICAgUkVUVVJO X0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKIAotICAgIEpTVmFs dWUgdmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDEpOwotICAgIGlmIChPcHRpb25zOjp1c2VX ZWJBc3NlbWJseVJlZmVyZW5jZXMoKSAmJiB2YWx1ZS5pc1VuZGVmaW5lZCgpKQotICAgICAgICB2 YWx1ZSA9IGpzTnVsbCgpOwotCiAgICAgdWludDMyX3QgaW5kZXggPSB0b05vbldyYXBwaW5nVWlu dDMyKGdsb2JhbE9iamVjdCwgY2FsbEZyYW1lLT5hcmd1bWVudCgwKSk7CiAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTih0aHJvd1Njb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKIAogICAgIGlmIChpbmRl eCA+PSB0YWJsZS0+bGVuZ3RoKCkpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNUmFuZ2VFcnJvcihn bG9iYWxPYmplY3QsIHRocm93U2NvcGUsICJXZWJBc3NlbWJseS5UYWJsZS5wcm90b3R5cGUuc2V0 IGV4cGVjdHMgYW4gaW50ZWdlciBsZXNzIHRoYW4gdGhlIGxlbmd0aCBvZiB0aGUgdGFibGUiX3Mp OwogCisgICAgSlNWYWx1ZSB2YWx1ZSA9IGNhbGxGcmFtZS0+YXJndW1lbnQoMSk7CisgICAgaWYg KE9wdGlvbnM6OnVzZVdlYkFzc2VtYmx5UmVmZXJlbmNlcygpICYmIGNhbGxGcmFtZS0+YXJndW1l bnRDb3VudCgpIDwgMikKKyAgICAgICAgdmFsdWUgPSBkZWZhdWx0VmFsdWVGb3JUYWJsZSh0YWJs ZS0+dGFibGUoKS0+dHlwZSgpKTsKKwogICAgIGlmICh0YWJsZS0+dGFibGUoKS0+YXNGdW5jcmVm VGFibGUoKSkgewogICAgICAgICBXZWJBc3NlbWJseUZ1bmN0aW9uKiB3YXNtRnVuY3Rpb24gPSBu dWxscHRyOwogICAgICAgICBXZWJBc3NlbWJseVdyYXBwZXJGdW5jdGlvbiogd2FzbVdyYXBwZXJG dW5jdGlvbiA9IG51bGxwdHI7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVz dHMvQ2hhbmdlTG9nCmluZGV4IDBiMmJiMzk4YTkyOTQ1Y2I5NGY1NjI5ZWIyOTk3MDI3ZjY0NjUw MzQuLjMyMTY2MjVjZmRiMjI5NDEyOTdiNDRmNjdmYWQxYzgwNjQzYjg1MzUgMTAwNjQ0Ci0tLSBh L0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMjEtMDEtMjUgIERtaXRyeSBCZXpoZXRza292ICA8ZGJlemhldHNrb3ZAaWdhbGlhLmNv bT4KKworICAgICAgICBbV0FTTS1SZWZlcmVuY2VzXSBDaGFuZ2UgZGVmYXVsdCB2YWx1ZSBmb3Ig ZXh0ZXJucmVmJ3MgdGFibGVzIGZyb20gbnVsbCB0byB1bmRlZmluZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDkxOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjY29yZGluZyB0byB0aGUgcmVmZXJl bmNlIHR5cGVzIHNwZWMKKyAgICAgICAgaHR0cHM6Ly93ZWJhc3NlbWJseS5naXRodWIuaW8vcmVm ZXJlbmNlLXR5cGVzL2pzLWFwaS8jZGVmYXVsdHZhbHVleQorICAgICAgICB3ZSBzaG91bGQgdXNl IHVuZGVmaW5lZCBhcyBhIGRlZmF1bHQgdmFsdWUgaW4gVGFibGUgY3Rvciwgc2V0IGFuZCBncm93 CisgICAgICAgIG1ldGhvZHMsIHNvIHRoaXMgcGF0Y2ggcmVwbGFjZXMgcHJldmlvdXMgbnVsbCBk ZWZhdWx0IHZhbHVlIGZvcgorICAgICAgICBleHRlcm5yZWYncyB0YWJsZSB0byB1bmRlZmluZWQu CisKKyAgICAgICAgKiB3YXNtL3JlZmVyZW5jZXMvZXh0ZXJucmVmX3RhYmxlX2ltcG9ydC5qczoK KyAgICAgICAgKHN0cmluZ19hcHBlYXJlZF9oZXJlLmZ1bGxHQy5hc3NlcnQuZXEuMS5leHBvcnRz LmdldF90YmwpOgorICAgICAgICAqIHdhc20vcmVmZXJlbmNlcy90YWJsZV9qc19hcGkuanM6Cisg ICAgICAgICh0ZXN0VGFibGVHcm93Rm9yRXh0ZXJucmVmVGFibGVzKToKKyAgICAgICAgKiB3YXNt L3JlZmVyZW5jZXMvdGFibGVfbWlzYy5qczoKKwogMjAyMS0wMS0yMSAgWXVzdWtlIFN1enVraSAg PHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEpTUHJvbWlzZSBzaG91bGQgbm90 IHByb3BhZ2F0ZSBUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3IKZGlmZiAtLWdpdCBhL0pTVGVzdHMv d2FzbS9yZWZlcmVuY2VzL2V4dGVybnJlZl90YWJsZV9pbXBvcnQuanMgYi9KU1Rlc3RzL3dhc20v cmVmZXJlbmNlcy9leHRlcm5yZWZfdGFibGVfaW1wb3J0LmpzCmluZGV4IDE0M2RlZjYwNzA4MzQ3 NzExY2NlNGIzYWIzNmQ4NmU5ZWVhNzAyYzUuLjA2NTcxNzIxOTI5M2U1MjlkOWQ5NzdiNzQ2NDg0 ZjUxMzY1YWQwNWQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvd2FzbS9yZWZlcmVuY2VzL2V4dGVybnJl Zl90YWJsZV9pbXBvcnQuanMKKysrIGIvSlNUZXN0cy93YXNtL3JlZmVyZW5jZXMvZXh0ZXJucmVm X3RhYmxlX2ltcG9ydC5qcwpAQCAtNDgsOCArNDgsOCBAQCBpbXBvcnQgQnVpbGRlciBmcm9tICcu Li9CdWlsZGVyLmpzJzsKICAgICBjb25zdCAkMSA9IG1ha2VJbXBvcnQoKQogICAgIGZ1bGxHQygp CiAKLSAgICBhc3NlcnQuZXEoJDEuZXhwb3J0cy5nZXRfdGJsKCksIG51bGwpCi0gICAgYXNzZXJ0 LmVxKCQxLmV4cG9ydHMudGJsX2lzX251bGwoKSwgMSkKKyAgICBhc3NlcnQuZXEoJDEuZXhwb3J0 cy5nZXRfdGJsKCksIHVuZGVmaW5lZCkKKyAgICBhc3NlcnQuZXEoJDEuZXhwb3J0cy50YmxfaXNf bnVsbCgpLCAwKQogCiAgICAgJDEuZXhwb3J0cy5zZXRfdGJsKCJoaSIpCiAgICAgZnVsbEdDKCkK QEAgLTU3LDcgKzU3LDcgQEAgaW1wb3J0IEJ1aWxkZXIgZnJvbSAnLi4vQnVpbGRlci5qcyc7CiAg ICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsX2lzX251bGwoKSwgMCkKIAogICAgIGFzc2VydC5l cSgkMS5leHBvcnRzLnRibC5nZXQoMCksICJoaSIpCi0gICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMu dGJsLmdldCgxKSwgbnVsbCkKKyAgICBhc3NlcnQuZXEoJDEuZXhwb3J0cy50YmwuZ2V0KDEpLCB1 bmRlZmluZWQpCiAKICAgICAkMS5leHBvcnRzLnRibC5zZXQoMCwgeyB0ZXN0OiAidGVzdCIgfSk7 CiAgICAgZnVsbEdDKCkKQEAgLTE2Myw3ICsxNjMsNyBAQCBpbXBvcnQgQnVpbGRlciBmcm9tICcu Li9CdWlsZGVyLmpzJzsKICAgICBhc3NlcnQuZXEoJDEuZXhwb3J0cy50YmxfaXNfbnVsbCgpLCAw KQogCiAgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsLmdldCgwKSwgImhpIikKLSAgICBhc3Nl cnQuZXEoJDEuZXhwb3J0cy50YmwuZ2V0KDEpLCBudWxsKQorICAgIGFzc2VydC5lcSgkMS5leHBv cnRzLnRibC5nZXQoMSksIHVuZGVmaW5lZCkKIAogICAgICQxLmV4cG9ydHMudGJsLnNldCgwLCB7 IHRlc3Q6ICJ0ZXN0IiB9KTsKICAgICBmdWxsR0MoKQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy93YXNt L3JlZmVyZW5jZXMvdGFibGVfanNfYXBpLmpzIGIvSlNUZXN0cy93YXNtL3JlZmVyZW5jZXMvdGFi bGVfanNfYXBpLmpzCmluZGV4IDVlYWNmMzVlODAwNzdlMzJkYmM3Yjk4YzBlZmQ5MDJjYjRlZTUz NWMuLmNkNWFmMTg4NmE2ZmZkNjllNGY5MGNlOWM2ODIwMmY5ZjdjZGUyZDYgMTAwNjQ0Ci0tLSBh L0pTVGVzdHMvd2FzbS9yZWZlcmVuY2VzL3RhYmxlX2pzX2FwaS5qcworKysgYi9KU1Rlc3RzL3dh c20vcmVmZXJlbmNlcy90YWJsZV9qc19hcGkuanMKQEAgLTE0LDYgKzE0LDEyIEBAIGZ1bmN0aW9u IHRlc3RUYWJsZUdyb3dGb3JFeHRlcm5yZWZUYWJsZXMoKSB7CiAgIGFzc2VydC5lcSh0YWJsZS5n ZXQoMSkuY2Fsb3JpZXMsIGNhbG9yaWVzKTsKICAgYXNzZXJ0LmVxKHRhYmxlLmdldCgyKS5jYWxv cmllcywgY2Fsb3JpZXMpOwogICBhc3NlcnQuZXEodGFibGUuZ2V0KDMpLmNhbG9yaWVzLCBjYWxv cmllcyk7CisKKyAgdGFibGUuZ3JvdygzKTsKKyAgYXNzZXJ0LmVxKHRhYmxlLmxlbmd0aCwgNyk7 CisgIGFzc2VydC5lcSh0YWJsZS5nZXQoNCksIHVuZGVmaW5lZCk7CisgIGFzc2VydC5lcSh0YWJs ZS5nZXQoNSksIHVuZGVmaW5lZCk7CisgIGFzc2VydC5lcSh0YWJsZS5nZXQoNiksIHVuZGVmaW5l ZCk7CiB9CiAKIGFzeW5jIGZ1bmN0aW9uIHRlc3RUYWJsZUdyb3dGb3JGdW5jcmVmVGFibGVzKCkg ewpAQCAtNTYsNyArNjIsMTAgQEAgZnVuY3Rpb24gdGVzdFRhYmxlU2V0Rm9yRXh0ZXJucmVmVGFi bGVzKCkgewogICBhc3NlcnQuZXEodGFibGUuZ2V0KDApLmNhbG9yaWVzLCBjYWxvcmllcyk7CiAK ICAgdGFibGUuc2V0KDApOwotICBhc3NlcnQuZXEodGFibGUuZ2V0KDApLCBudWxsKTsKKyAgYXNz ZXJ0LmVxKHRhYmxlLmdldCgwKSwgdW5kZWZpbmVkKTsKKworICBhc3NlcnQudGhyb3dzKCgpID0+ IHRhYmxlLnNldCg0KSwgUmFuZ2VFcnJvciwgIldlYkFzc2VtYmx5LlRhYmxlLnByb3RvdHlwZS5z ZXQgZXhwZWN0cyBhbiBpbnRlZ2VyIGxlc3MgdGhhbiB0aGUgbGVuZ3RoIG9mIHRoZSB0YWJsZSIp OworICBhc3NlcnQudGhyb3dzKCgpID0+IHRhYmxlLnNldCgxMDA1MDApLCBSYW5nZUVycm9yLCAi V2ViQXNzZW1ibHkuVGFibGUucHJvdG90eXBlLnNldCBleHBlY3RzIGFuIGludGVnZXIgbGVzcyB0 aGFuIHRoZSBsZW5ndGggb2YgdGhlIHRhYmxlIik7CiB9CiAKIGFzeW5jIGZ1bmN0aW9uIHRlc3RU YWJsZVNldEZvckZ1bmNyZWZUYWJsZXMoKSB7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL3dhc20vcmVm ZXJlbmNlcy90YWJsZV9taXNjLmpzIGIvSlNUZXN0cy93YXNtL3JlZmVyZW5jZXMvdGFibGVfbWlz Yy5qcwppbmRleCAwMzllODNiOTc0MGU1ZTJmMzM0MjhmMWI4ODgzYWMzZWJmYTJlZDk3Li5iNDUz ZTdlZDA2NDMxY2NjODU2ZmJhYWMzNWM0NmRjY2I3NmVjNzMwIDEwMDY0NAotLS0gYS9KU1Rlc3Rz L3dhc20vcmVmZXJlbmNlcy90YWJsZV9taXNjLmpzCisrKyBiL0pTVGVzdHMvd2FzbS9yZWZlcmVu Y2VzL3RhYmxlX21pc2MuanMKQEAgLTI1LDcgKzI1LDcgQEAgaW1wb3J0IEJ1aWxkZXIgZnJvbSAn Li4vQnVpbGRlci5qcyc7CiAgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsLmdyb3coNSksIDIw KQogICAgIGFzc2VydC5lcSgkMS5leHBvcnRzLnRibF9zaXplKCksIDI1KQogICAgIGFzc2VydC5l cSgkMS5leHBvcnRzLnRibC5nZXQoMCksIG51bGwpCi0gICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMu dGJsLmdldCgyNCksIG51bGwpCisgICAgYXNzZXJ0LmVxKCQxLmV4cG9ydHMudGJsLmdldCgyNCks IHVuZGVmaW5lZCkKIH0KIAogYXNzZXJ0LnRocm93cygoKSA9PiBuZXcgV2ViQXNzZW1ibHkuTW9k dWxlKChuZXcgQnVpbGRlcigpKQo=