229793 2021-09-01 23:46:34 -0700 [JSC] Fix invalid exception checks in Temporal classes 2021-09-02 01:55:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1789604 0 ross.kirsling 2021-09-01 23:46:34 -0700 [JSC] Fix invalid exception checks in Temporal classes 1789605 1 437115 ross.kirsling 2021-09-01 23:47:21 -0700 Created attachment 437115 Patch 1789613 2 437115 ysuzuki 2021-09-02 00:45:55 -0700 Comment on attachment 437115 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437115&action=review r=me with comments. > Source/JavaScriptCore/runtime/TemporalDurationPrototype.cpp:132 > + RETURN_IF_EXCEPTION(scope, encodedJSValue()); In new code, we are using RETURN_IF_EXCEPTION(scope, { }); > Source/JavaScriptCore/runtime/TemporalDurationPrototype.cpp:171 > + RETURN_IF_EXCEPTION(scope, encodedJSValue()); Ditto. > Source/JavaScriptCore/runtime/TemporalDurationPrototype.cpp:186 > + RETURN_IF_EXCEPTION(scope, encodedJSValue()); Ditto. > Source/JavaScriptCore/runtime/TemporalDurationPrototype.cpp:205 > + RETURN_IF_EXCEPTION(scope, encodedJSValue()); Ditto. 1789614 3 437120 ross.kirsling 2021-09-02 00:53:51 -0700 Created attachment 437120 Patch for landing 1789635 4 ews-feeder 2021-09-02 01:52:16 -0700 Committed r281912 (241224@main): <https://commits.webkit.org/241224@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437120. 1789637 5 webkit-bug-importer 2021-09-02 01:55:08 -0700 <rdar://problem/82665434> 437115 2021-09-01 23:47:21 -0700 2021-09-02 00:53:48 -0700 Patch bug-229793-20210901234720.patch text/plain 7248 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZjAzNWQxNWNiNWVhNjgwNGJmOTIyOWYxNGNmYTFlMmZkN2NkYTZmLi4zOGMyYzQ3ZDRhNmRiYWM4 MTFlYmU2NTYyNmI5ZDRiOWVjOTM3OThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMS0wOS0wMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgW0pTQ10gRml4IGludmFsaWQgZXhjZXB0aW9uIGNoZWNrcyBpbiBU ZW1wb3JhbCBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjk3OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHJ1bnRpbWUvVGVtcG9yYWxDYWxlbmRhclByb3RvdHlwZS5jcHA6CisgICAgICAg IChKU0M6OkpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTik6CisgICAgICAgICogcnVudGltZS9UZW1w b3JhbER1cmF0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6VGVtcG9yYWxEdXJhdGlvbjo6ZnJvbU9i amVjdCk6CisgICAgICAgIChKU0M6OlRlbXBvcmFsRHVyYXRpb246OnRvRHVyYXRpb24pOgorICAg ICAgICAoSlNDOjpUZW1wb3JhbER1cmF0aW9uOjp3aXRoIGNvbnN0KToKKyAgICAgICAgKiBydW50 aW1lL1RlbXBvcmFsRHVyYXRpb25Qcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpKU0NfREVG SU5FX0hPU1RfRlVOQ1RJT04pOgorCiAyMDIxLTA5LTAxICBSb3NzIEtpcnNsaW5nICA8cm9zcy5r aXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGV4Y2VwdGlvbiBzY29wZSB2 ZXJpZmljYXRpb24gZml4IGZvciByMjQxMTcxLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvVGVtcG9yYWxDYWxlbmRhclByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbENhbGVuZGFyUHJvdG90eXBlLmNwcAppbmRleCBi MjY3M2I3MGY5NzdkM2Y4YjQ5NjViZDM5NDBhNjA1MDYzN2JjZmYyLi45Y2E2NDlkM2UwYmU5NmJh ZmM1YzFiNzM2YWU3YjBiNWJkY2NiNDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9UZW1wb3JhbENhbGVuZGFyUHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbENhbGVuZGFyUHJvdG90eXBlLmNwcApAQCAtMTIy LDcgKzEyMiw3IEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTih0ZW1wb3JhbENhbGVuZGFyUHJv dG90eXBlRnVuY0ZpZWxkcywgKEpTR2xvYmFsT2JqZWN0KiBnCiAgICAgICAgIGZpZWxkTmFtZXMu YXBwZW5kKGpzTm9udHJpdmlhbFN0cmluZyh2bSwgdm0ucHJvcGVydHlOYW1lcy0+ZXJhWWVhci5p bXBsKCkpKTsKICAgICB9CiAKLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNvbnN0cnVjdEFy cmF5KGdsb2JhbE9iamVjdCwgc3RhdGljX2Nhc3Q8QXJyYXlBbGxvY2F0aW9uUHJvZmlsZSo+KG51 bGxwdHIpLCBmaWVsZE5hbWVzKSk7CisgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1Zh bHVlOjplbmNvZGUoY29uc3RydWN0QXJyYXkoZ2xvYmFsT2JqZWN0LCBzdGF0aWNfY2FzdDxBcnJh eUFsbG9jYXRpb25Qcm9maWxlKj4obnVsbHB0ciksIGZpZWxkTmFtZXMpKSk7CiB9CiAKIC8vIGh0 dHBzOi8vdGMzOS5lcy9wcm9wb3NhbC10ZW1wb3JhbC8jc2VjLXRlbXBvcmFsLWRlZmF1bHRtZXJn ZWZpZWxkcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVGVtcG9y YWxEdXJhdGlvbi5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbER1 cmF0aW9uLmNwcAppbmRleCBmYjFjNGUwNGUxNDcyNDBkZmY5MDZjMTU2NmMxN2YwYzgyOTYzMDQ2 Li42N2FkNGU4MTlmZjRiYmU4MjMxN2QwZjc3NGNjYmZkYjNhYTNiM2ZlIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbER1cmF0aW9uLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbER1cmF0aW9uLmNwcApAQCAtMTE0 LDYgKzExNCw3IEBAIFRlbXBvcmFsRHVyYXRpb246OlN1YmR1cmF0aW9ucyBUZW1wb3JhbER1cmF0 aW9uOjpmcm9tT2JqZWN0KEpTR2xvYmFsT2JqZWN0KiBnbG9iCiAgICAgYXV0byBoYXNSZWxldmFu dFByb3BlcnR5ID0gZmFsc2U7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1iZXJPZlRl bXBvcmFsVW5pdHM7IGkrKykgewogICAgICAgICBKU1ZhbHVlIHZhbHVlID0gZHVyYXRpb25MaWtl LT5nZXQoZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUodm0sIGkpKTsKKyAgICAgICAgUkVUVVJO X0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKIAogICAgICAgICBpZiAodmFsdWUuaXNVbmRlZmlu ZWQoKSkgewogICAgICAgICAgICAgcmVzdWx0W2ldID0gMDsKQEAgLTE0OCw4ICsxNDksMTIgQEAg VGVtcG9yYWxEdXJhdGlvbiogVGVtcG9yYWxEdXJhdGlvbjo6dG9EdXJhdGlvbihKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBKU1YKICAgICBpZiAoaXRlbVZhbHVlLmluaGVyaXRzPFRlbXBv cmFsRHVyYXRpb24+KHZtKSkKICAgICAgICAgcmV0dXJuIGpzQ2FzdDxUZW1wb3JhbER1cmF0aW9u Kj4oaXRlbVZhbHVlKTsKIAotICAgIGlmIChpdGVtVmFsdWUuaXNPYmplY3QoKSkKLSAgICAgICAg UkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBUZW1wb3JhbER1cmF0aW9uOjp0cnlDcmVhdGVJZlZh bGlkKGdsb2JhbE9iamVjdCwgZnJvbU9iamVjdChnbG9iYWxPYmplY3QsIGFzT2JqZWN0KGl0ZW1W YWx1ZSkpKSk7CisgICAgaWYgKGl0ZW1WYWx1ZS5pc09iamVjdCgpKSB7CisgICAgICAgIGF1dG8g c3ViZHVyYXRpb25zID0gZnJvbU9iamVjdChnbG9iYWxPYmplY3QsIGFzT2JqZWN0KGl0ZW1WYWx1 ZSkpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsKKworICAg ICAgICBSRUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIFRlbXBvcmFsRHVyYXRpb246OnRyeUNyZWF0 ZUlmVmFsaWQoZ2xvYmFsT2JqZWN0LCBXVEZNb3ZlKHN1YmR1cmF0aW9ucykpKTsKKyAgICB9CiAK ICAgICBTdHJpbmcgc3RyaW5nID0gaXRlbVZhbHVlLnRvV1RGU3RyaW5nKGdsb2JhbE9iamVjdCk7 CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgbnVsbHB0cik7CkBAIC0yMzEsNiArMjM2 LDcgQEAgVGVtcG9yYWxEdXJhdGlvbjo6U3ViZHVyYXRpb25zIFRlbXBvcmFsRHVyYXRpb246Ondp dGgoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamUKICAgICBhdXRvIGhhc1JlbGV2YW50UHJvcGVy dHkgPSBmYWxzZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG51bWJlck9mVGVtcG9yYWxV bml0czsgaSsrKSB7CiAgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBkdXJhdGlvbkxpa2UtPmdldChn bG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSh2bSwgaSkpOworICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHNjb3BlLCB7IH0pOwogCiAgICAgICAgIGlmICh2YWx1ZS5pc1VuZGVmaW5lZCgpKSB7 CiAgICAgICAgICAgICByZXN1bHRbaV0gPSBtX3N1YmR1cmF0aW9uc1tpXTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1RlbXBvcmFsRHVyYXRpb25Qcm90b3R5cGUu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVGVtcG9yYWxEdXJhdGlvblByb3Rv dHlwZS5jcHAKaW5kZXggODUxOGMyZDE2YzQ2ODUyZjQ5OWE4MjM1MTViZGM2ZDRiYjRlYTM5Ni4u YjgwNjFkZmQzODk1M2I0NGM2ZjllYjdhOTdhYzZiYmFiNjY5MWI2MyAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVGVtcG9yYWxEdXJhdGlvblByb3RvdHlwZS5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVGVtcG9yYWxEdXJhdGlvblByb3Rv dHlwZS5jcHAKQEAgLTEyOCw3ICsxMjgsMTAgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRl bXBvcmFsRHVyYXRpb25Qcm90b3R5cGVGdW5jV2l0aCwgKEpTR2xvYmFsT2JqZWN0KiBnbG8KICAg ICBpZiAoIWR1cmF0aW9uTGlrZS5pc09iamVjdCgpKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5 cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiRmlyc3QgYXJndW1lbnQgdG8gVGVtcG9yYWwu RHVyYXRpb24ucHJvdG90eXBlLndpdGggbXVzdCBiZSBhbiBvYmplY3QiX3MpOwogCi0gICAgUkVM RUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1ZhbHVlOjplbmNvZGUoVGVtcG9yYWxEdXJhdGlvbjo6 dHJ5Q3JlYXRlSWZWYWxpZChnbG9iYWxPYmplY3QsIGR1cmF0aW9uLT53aXRoKGdsb2JhbE9iamVj dCwgYXNPYmplY3QoZHVyYXRpb25MaWtlKSkpKSk7CisgICAgYXV0byBzdWJkdXJhdGlvbnMgPSBk dXJhdGlvbi0+d2l0aChnbG9iYWxPYmplY3QsIGFzT2JqZWN0KGR1cmF0aW9uTGlrZSkpOworICAg IFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworCisgICAgUkVM RUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1ZhbHVlOjplbmNvZGUoVGVtcG9yYWxEdXJhdGlvbjo6 dHJ5Q3JlYXRlSWZWYWxpZChnbG9iYWxPYmplY3QsIFdURk1vdmUoc3ViZHVyYXRpb25zKSkpKTsK IH0KIAogSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRlbXBvcmFsRHVyYXRpb25Qcm90b3R5cGVG dW5jTmVnYXRlZCwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIENhbGxGcmFtZSogY2Fs bEZyYW1lKSkKQEAgLTE2NCw3ICsxNjcsMTAgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRl bXBvcmFsRHVyYXRpb25Qcm90b3R5cGVGdW5jQWRkLCAoSlNHbG9iYWxPYmplY3QqIGdsb2IKICAg ICBpZiAoIWR1cmF0aW9uKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxP YmplY3QsIHNjb3BlLCAiVGVtcG9yYWwuRHVyYXRpb24ucHJvdG90eXBlLmFkZCBjYWxsZWQgb24g dmFsdWUgdGhhdCdzIG5vdCBhIER1cmF0aW9uIl9zKTsKIAotICAgIFJFTEVBU0VfQU5EX1JFVFVS TihzY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKFRlbXBvcmFsRHVyYXRpb246OnRyeUNyZWF0ZUlmVmFs aWQoZ2xvYmFsT2JqZWN0LCBkdXJhdGlvbi0+YWRkKGdsb2JhbE9iamVjdCwgY2FsbEZyYW1lLT5h cmd1bWVudCgwKSkpKSk7CisgICAgYXV0byBzdWJkdXJhdGlvbnMgPSBkdXJhdGlvbi0+YWRkKGds b2JhbE9iamVjdCwgY2FsbEZyYW1lLT5hcmd1bWVudCgwKSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisKKyAgICBSRUxFQVNFX0FORF9SRVRVUk4o c2NvcGUsIEpTVmFsdWU6OmVuY29kZShUZW1wb3JhbER1cmF0aW9uOjp0cnlDcmVhdGVJZlZhbGlk KGdsb2JhbE9iamVjdCwgV1RGTW92ZShzdWJkdXJhdGlvbnMpKSkpOwogfQogCiBKU0NfREVGSU5F X0hPU1RfRlVOQ1RJT04odGVtcG9yYWxEdXJhdGlvblByb3RvdHlwZUZ1bmNTdWJ0cmFjdCwgKEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIENhbGxGcmFtZSogY2FsbEZyYW1lKSkKQEAgLTE3 Niw3ICsxODIsMTAgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRlbXBvcmFsRHVyYXRpb25Q cm90b3R5cGVGdW5jU3VidHJhY3QsIChKU0dsb2JhbE9iamVjdCoKICAgICBpZiAoIWR1cmF0aW9u KQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAi VGVtcG9yYWwuRHVyYXRpb24ucHJvdG90eXBlLnN1YnRyYWN0IGNhbGxlZCBvbiB2YWx1ZSB0aGF0 J3Mgbm90IGEgRHVyYXRpb24iX3MpOwogCi0gICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBK U1ZhbHVlOjplbmNvZGUoVGVtcG9yYWxEdXJhdGlvbjo6dHJ5Q3JlYXRlSWZWYWxpZChnbG9iYWxP YmplY3QsIGR1cmF0aW9uLT5zdWJ0cmFjdChnbG9iYWxPYmplY3QsIGNhbGxGcmFtZS0+YXJndW1l bnQoMCkpKSkpOworICAgIGF1dG8gc3ViZHVyYXRpb25zID0gZHVyYXRpb24tPnN1YnRyYWN0KGds b2JhbE9iamVjdCwgY2FsbEZyYW1lLT5hcmd1bWVudCgwKSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisKKyAgICBSRUxFQVNFX0FORF9SRVRVUk4o c2NvcGUsIEpTVmFsdWU6OmVuY29kZShUZW1wb3JhbER1cmF0aW9uOjp0cnlDcmVhdGVJZlZhbGlk KGdsb2JhbE9iamVjdCwgV1RGTW92ZShzdWJkdXJhdGlvbnMpKSkpOwogfQogCiBKU0NfREVGSU5F X0hPU1RfRlVOQ1RJT04odGVtcG9yYWxEdXJhdGlvblByb3RvdHlwZUZ1bmNSb3VuZCwgKEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIENhbGxGcmFtZSogY2FsbEZyYW1lKSkKQEAgLTE5Miw3 ICsyMDEsMTAgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRlbXBvcmFsRHVyYXRpb25Qcm90 b3R5cGVGdW5jUm91bmQsIChKU0dsb2JhbE9iamVjdCogZ2wKICAgICBpZiAob3B0aW9ucy5pc1Vu ZGVmaW5lZCgpKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3Qs IHNjb3BlLCAiVGVtcG9yYWwuRHVyYXRpb24ucHJvdG90eXBlLnJvdW5kIHJlcXVpcmVzIGFuIG9w dGlvbnMgYXJndW1lbnQiX3MpOwogCi0gICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1Zh bHVlOjplbmNvZGUoVGVtcG9yYWxEdXJhdGlvbjo6dHJ5Q3JlYXRlSWZWYWxpZChnbG9iYWxPYmpl Y3QsIGR1cmF0aW9uLT5yb3VuZChnbG9iYWxPYmplY3QsIG9wdGlvbnMpKSkpOworICAgIGF1dG8g c3ViZHVyYXRpb25zID0gZHVyYXRpb24tPnJvdW5kKGdsb2JhbE9iamVjdCwgb3B0aW9ucyk7Cisg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisKKyAgICBS RUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIEpTVmFsdWU6OmVuY29kZShUZW1wb3JhbER1cmF0aW9u Ojp0cnlDcmVhdGVJZlZhbGlkKGdsb2JhbE9iamVjdCwgV1RGTW92ZShzdWJkdXJhdGlvbnMpKSkp OwogfQogCiBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04odGVtcG9yYWxEdXJhdGlvblByb3RvdHlw ZUZ1bmNUb3RhbCwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIENhbGxGcmFtZSogY2Fs bEZyYW1lKSkK 437120 2021-09-02 00:53:51 -0700 2021-09-02 01:52:17 -0700 Patch for landing bug-229793-20210902005350.patch text/plain 7195 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZjAzNWQxNWNiNWVhNjgwNGJmOTIyOWYxNGNmYTFlMmZkN2NkYTZmLi40MjY3NmI4Zjg2MmQ1ZDRi YzU1YjdiOGFhNTgwNjI0NjM0MTQ5ZDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMS0wOS0wMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgW0pTQ10gRml4IGludmFsaWQgZXhjZXB0aW9uIGNoZWNrcyBpbiBU ZW1wb3JhbCBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjk3OTMKKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisg ICAgICAgICogcnVudGltZS9UZW1wb3JhbENhbGVuZGFyUHJvdG90eXBlLmNwcDoKKyAgICAgICAg KEpTQzo6SlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKToKKyAgICAgICAgKiBydW50aW1lL1RlbXBv cmFsRHVyYXRpb24uY3BwOgorICAgICAgICAoSlNDOjpUZW1wb3JhbER1cmF0aW9uOjpmcm9tT2Jq ZWN0KToKKyAgICAgICAgKEpTQzo6VGVtcG9yYWxEdXJhdGlvbjo6dG9EdXJhdGlvbik6CisgICAg ICAgIChKU0M6OlRlbXBvcmFsRHVyYXRpb246OndpdGggY29uc3QpOgorICAgICAgICAqIHJ1bnRp bWUvVGVtcG9yYWxEdXJhdGlvblByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OkpTQ19ERUZJ TkVfSE9TVF9GVU5DVElPTik6CisKIDIwMjEtMDktMDEgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtp cnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZXhjZXB0aW9uIHNjb3BlIHZl cmlmaWNhdGlvbiBmaXggZm9yIHIyNDExNzEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9UZW1wb3JhbENhbGVuZGFyUHJvdG90eXBlLmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1RlbXBvcmFsQ2FsZW5kYXJQcm90b3R5cGUuY3BwCmluZGV4IGIy NjczYjcwZjk3N2QzZjhiNDk2NWJkMzk0MGE2MDUwNjM3YmNmZjIuLjljYTY0OWQzZTBiZTk2YmFm YzVjMWI3MzZhZTdiMGI1YmRjY2I0OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1RlbXBvcmFsQ2FsZW5kYXJQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1RlbXBvcmFsQ2FsZW5kYXJQcm90b3R5cGUuY3BwCkBAIC0xMjIs NyArMTIyLDcgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRlbXBvcmFsQ2FsZW5kYXJQcm90 b3R5cGVGdW5jRmllbGRzLCAoSlNHbG9iYWxPYmplY3QqIGcKICAgICAgICAgZmllbGROYW1lcy5h cHBlbmQoanNOb250cml2aWFsU3RyaW5nKHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5lcmFZZWFyLmlt cGwoKSkpOwogICAgIH0KIAotICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY29uc3RydWN0QXJy YXkoZ2xvYmFsT2JqZWN0LCBzdGF0aWNfY2FzdDxBcnJheUFsbG9jYXRpb25Qcm9maWxlKj4obnVs bHB0ciksIGZpZWxkTmFtZXMpKTsKKyAgICBSRUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIEpTVmFs dWU6OmVuY29kZShjb25zdHJ1Y3RBcnJheShnbG9iYWxPYmplY3QsIHN0YXRpY19jYXN0PEFycmF5 QWxsb2NhdGlvblByb2ZpbGUqPihudWxscHRyKSwgZmllbGROYW1lcykpKTsKIH0KIAogLy8gaHR0 cHM6Ly90YzM5LmVzL3Byb3Bvc2FsLXRlbXBvcmFsLyNzZWMtdGVtcG9yYWwtZGVmYXVsdG1lcmdl ZmllbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3Jh bER1cmF0aW9uLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1RlbXBvcmFsRHVy YXRpb24uY3BwCmluZGV4IGZiMWM0ZTA0ZTE0NzI0MGRmZjkwNmMxNTY2YzE3ZjBjODI5NjMwNDYu LjY3YWQ0ZTgxOWZmNGJiZTgyMzE3ZDBmNzc0Y2NiZmRiM2FhM2IzZmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1RlbXBvcmFsRHVyYXRpb24uY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1RlbXBvcmFsRHVyYXRpb24uY3BwCkBAIC0xMTQs NiArMTE0LDcgQEAgVGVtcG9yYWxEdXJhdGlvbjo6U3ViZHVyYXRpb25zIFRlbXBvcmFsRHVyYXRp b246OmZyb21PYmplY3QoSlNHbG9iYWxPYmplY3QqIGdsb2IKICAgICBhdXRvIGhhc1JlbGV2YW50 UHJvcGVydHkgPSBmYWxzZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG51bWJlck9mVGVt cG9yYWxVbml0czsgaSsrKSB7CiAgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBkdXJhdGlvbkxpa2Ut PmdldChnbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSh2bSwgaSkpOworICAgICAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogCiAgICAgICAgIGlmICh2YWx1ZS5pc1VuZGVmaW5l ZCgpKSB7CiAgICAgICAgICAgICByZXN1bHRbaV0gPSAwOwpAQCAtMTQ4LDggKzE0OSwxMiBAQCBU ZW1wb3JhbER1cmF0aW9uKiBUZW1wb3JhbER1cmF0aW9uOjp0b0R1cmF0aW9uKEpTR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QsIEpTVgogICAgIGlmIChpdGVtVmFsdWUuaW5oZXJpdHM8VGVtcG9y YWxEdXJhdGlvbj4odm0pKQogICAgICAgICByZXR1cm4ganNDYXN0PFRlbXBvcmFsRHVyYXRpb24q PihpdGVtVmFsdWUpOwogCi0gICAgaWYgKGl0ZW1WYWx1ZS5pc09iamVjdCgpKQotICAgICAgICBS RUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIFRlbXBvcmFsRHVyYXRpb246OnRyeUNyZWF0ZUlmVmFs aWQoZ2xvYmFsT2JqZWN0LCBmcm9tT2JqZWN0KGdsb2JhbE9iamVjdCwgYXNPYmplY3QoaXRlbVZh bHVlKSkpKTsKKyAgICBpZiAoaXRlbVZhbHVlLmlzT2JqZWN0KCkpIHsKKyAgICAgICAgYXV0byBz dWJkdXJhdGlvbnMgPSBmcm9tT2JqZWN0KGdsb2JhbE9iamVjdCwgYXNPYmplY3QoaXRlbVZhbHVl KSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOworCisgICAg ICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29wZSwgVGVtcG9yYWxEdXJhdGlvbjo6dHJ5Q3JlYXRl SWZWYWxpZChnbG9iYWxPYmplY3QsIFdURk1vdmUoc3ViZHVyYXRpb25zKSkpOworICAgIH0KIAog ICAgIFN0cmluZyBzdHJpbmcgPSBpdGVtVmFsdWUudG9XVEZTdHJpbmcoZ2xvYmFsT2JqZWN0KTsK ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsKQEAgLTIzMSw2ICsyMzYs NyBAQCBUZW1wb3JhbER1cmF0aW9uOjpTdWJkdXJhdGlvbnMgVGVtcG9yYWxEdXJhdGlvbjo6d2l0 aChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZQogICAgIGF1dG8gaGFzUmVsZXZhbnRQcm9wZXJ0 eSA9IGZhbHNlOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtYmVyT2ZUZW1wb3JhbFVu aXRzOyBpKyspIHsKICAgICAgICAgSlNWYWx1ZSB2YWx1ZSA9IGR1cmF0aW9uTGlrZS0+Z2V0KGds b2JhbE9iamVjdCwgcHJvcGVydHlOYW1lKHZtLCBpKSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIHsgfSk7CiAKICAgICAgICAgaWYgKHZhbHVlLmlzVW5kZWZpbmVkKCkpIHsK ICAgICAgICAgICAgIHJlc3VsdFtpXSA9IG1fc3ViZHVyYXRpb25zW2ldOwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVGVtcG9yYWxEdXJhdGlvblByb3RvdHlwZS5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbER1cmF0aW9uUHJvdG90 eXBlLmNwcAppbmRleCA4NTE4YzJkMTZjNDY4NTJmNDk5YTgyMzUxNWJkYzZkNGJiNGVhMzk2Li44 YmFjYjZkMzlmYjQxNTIzODFhNDU4MTljYzVhMmIzNmZlNmZmYWFiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbER1cmF0aW9uUHJvdG90eXBlLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UZW1wb3JhbER1cmF0aW9uUHJvdG90 eXBlLmNwcApAQCAtMTI4LDcgKzEyOCwxMCBAQCBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04odGVt cG9yYWxEdXJhdGlvblByb3RvdHlwZUZ1bmNXaXRoLCAoSlNHbG9iYWxPYmplY3QqIGdsbwogICAg IGlmICghZHVyYXRpb25MaWtlLmlzT2JqZWN0KCkpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlw ZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJGaXJzdCBhcmd1bWVudCB0byBUZW1wb3JhbC5E dXJhdGlvbi5wcm90b3R5cGUud2l0aCBtdXN0IGJlIGFuIG9iamVjdCJfcyk7CiAKLSAgICBSRUxF QVNFX0FORF9SRVRVUk4oc2NvcGUsIEpTVmFsdWU6OmVuY29kZShUZW1wb3JhbER1cmF0aW9uOjp0 cnlDcmVhdGVJZlZhbGlkKGdsb2JhbE9iamVjdCwgZHVyYXRpb24tPndpdGgoZ2xvYmFsT2JqZWN0 LCBhc09iamVjdChkdXJhdGlvbkxpa2UpKSkpKTsKKyAgICBhdXRvIHN1YmR1cmF0aW9ucyA9IGR1 cmF0aW9uLT53aXRoKGdsb2JhbE9iamVjdCwgYXNPYmplY3QoZHVyYXRpb25MaWtlKSk7CisgICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKworICAgIFJFTEVBU0VfQU5EX1JFVFVS TihzY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKFRlbXBvcmFsRHVyYXRpb246OnRyeUNyZWF0ZUlmVmFs aWQoZ2xvYmFsT2JqZWN0LCBXVEZNb3ZlKHN1YmR1cmF0aW9ucykpKSk7CiB9CiAKIEpTQ19ERUZJ TkVfSE9TVF9GVU5DVElPTih0ZW1wb3JhbER1cmF0aW9uUHJvdG90eXBlRnVuY05lZ2F0ZWQsIChK U0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYWxsRnJhbWUqIGNhbGxGcmFtZSkpCkBAIC0x NjQsNyArMTY3LDEwIEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTih0ZW1wb3JhbER1cmF0aW9u UHJvdG90eXBlRnVuY0FkZCwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iCiAgICAgaWYgKCFkdXJhdGlv bikKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwg IlRlbXBvcmFsLkR1cmF0aW9uLnByb3RvdHlwZS5hZGQgY2FsbGVkIG9uIHZhbHVlIHRoYXQncyBu b3QgYSBEdXJhdGlvbiJfcyk7CiAKLSAgICBSRUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIEpTVmFs dWU6OmVuY29kZShUZW1wb3JhbER1cmF0aW9uOjp0cnlDcmVhdGVJZlZhbGlkKGdsb2JhbE9iamVj dCwgZHVyYXRpb24tPmFkZChnbG9iYWxPYmplY3QsIGNhbGxGcmFtZS0+YXJndW1lbnQoMCkpKSkp OworICAgIGF1dG8gc3ViZHVyYXRpb25zID0gZHVyYXRpb24tPmFkZChnbG9iYWxPYmplY3QsIGNh bGxGcmFtZS0+YXJndW1lbnQoMCkpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsg fSk7CisKKyAgICBSRUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIEpTVmFsdWU6OmVuY29kZShUZW1w b3JhbER1cmF0aW9uOjp0cnlDcmVhdGVJZlZhbGlkKGdsb2JhbE9iamVjdCwgV1RGTW92ZShzdWJk dXJhdGlvbnMpKSkpOwogfQogCiBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04odGVtcG9yYWxEdXJh dGlvblByb3RvdHlwZUZ1bmNTdWJ0cmFjdCwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3Qs IENhbGxGcmFtZSogY2FsbEZyYW1lKSkKQEAgLTE3Niw3ICsxODIsMTAgQEAgSlNDX0RFRklORV9I T1NUX0ZVTkNUSU9OKHRlbXBvcmFsRHVyYXRpb25Qcm90b3R5cGVGdW5jU3VidHJhY3QsIChKU0ds b2JhbE9iamVjdCoKICAgICBpZiAoIWR1cmF0aW9uKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5 cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiVGVtcG9yYWwuRHVyYXRpb24ucHJvdG90eXBl LnN1YnRyYWN0IGNhbGxlZCBvbiB2YWx1ZSB0aGF0J3Mgbm90IGEgRHVyYXRpb24iX3MpOwogCi0g ICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1ZhbHVlOjplbmNvZGUoVGVtcG9yYWxEdXJh dGlvbjo6dHJ5Q3JlYXRlSWZWYWxpZChnbG9iYWxPYmplY3QsIGR1cmF0aW9uLT5zdWJ0cmFjdChn bG9iYWxPYmplY3QsIGNhbGxGcmFtZS0+YXJndW1lbnQoMCkpKSkpOworICAgIGF1dG8gc3ViZHVy YXRpb25zID0gZHVyYXRpb24tPnN1YnRyYWN0KGdsb2JhbE9iamVjdCwgY2FsbEZyYW1lLT5hcmd1 bWVudCgwKSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKworICAgIFJF TEVBU0VfQU5EX1JFVFVSTihzY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKFRlbXBvcmFsRHVyYXRpb246 OnRyeUNyZWF0ZUlmVmFsaWQoZ2xvYmFsT2JqZWN0LCBXVEZNb3ZlKHN1YmR1cmF0aW9ucykpKSk7 CiB9CiAKIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTih0ZW1wb3JhbER1cmF0aW9uUHJvdG90eXBl RnVuY1JvdW5kLCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgQ2FsbEZyYW1lKiBjYWxs RnJhbWUpKQpAQCAtMTkyLDcgKzIwMSwxMCBAQCBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04odGVt cG9yYWxEdXJhdGlvblByb3RvdHlwZUZ1bmNSb3VuZCwgKEpTR2xvYmFsT2JqZWN0KiBnbAogICAg IGlmIChvcHRpb25zLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVy cm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJUZW1wb3JhbC5EdXJhdGlvbi5wcm90b3R5cGUucm91 bmQgcmVxdWlyZXMgYW4gb3B0aW9ucyBhcmd1bWVudCJfcyk7CiAKLSAgICBSRUxFQVNFX0FORF9S RVRVUk4oc2NvcGUsIEpTVmFsdWU6OmVuY29kZShUZW1wb3JhbER1cmF0aW9uOjp0cnlDcmVhdGVJ ZlZhbGlkKGdsb2JhbE9iamVjdCwgZHVyYXRpb24tPnJvdW5kKGdsb2JhbE9iamVjdCwgb3B0aW9u cykpKSk7CisgICAgYXV0byBzdWJkdXJhdGlvbnMgPSBkdXJhdGlvbi0+cm91bmQoZ2xvYmFsT2Jq ZWN0LCBvcHRpb25zKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworCisg ICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBKU1ZhbHVlOjplbmNvZGUoVGVtcG9yYWxEdXJh dGlvbjo6dHJ5Q3JlYXRlSWZWYWxpZChnbG9iYWxPYmplY3QsIFdURk1vdmUoc3ViZHVyYXRpb25z KSkpKTsKIH0KIAogSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHRlbXBvcmFsRHVyYXRpb25Qcm90 b3R5cGVGdW5jVG90YWwsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYWxsRnJhbWUq IGNhbGxGcmFtZSkpCg==