229982 2021-09-07 00:41:09 -0700 webgl/2.0.y/deqp/functional/gles3/negativestateapi.html get_query_parameter fails on Metal 2021-09-07 23:44:18 -0700 1 1 1 Unclassified WebKit WebGL WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229947 222812 1 kkinnunen kkinnunen dino kbr kkinnunen webkit-bug-importer oldest_to_newest 1790881 0 kkinnunen 2021-09-07 00:41:09 -0700 Start testcase: state.get_query_parameter FAIL state.get_query_parameter: Expected gl.INVALID_OPERATION, but got gl.NO_ERROR. 1790948 1 437486 kkinnunen 2021-09-07 04:21:05 -0700 Created attachment 437486 Patch 1791126 2 437486 dino 2021-09-07 11:08:49 -0700 Comment on attachment 437486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437486&action=review > Source/WebCore/html/canvas/WebGL2RenderingContext.cpp:80 > +#include <algorithm> Why this? 1791130 3 kkinnunen 2021-09-07 11:14:40 -0700 (In reply to Dean Jackson from comment #2) > Comment on attachment 437486 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=437486&action=review > > > Source/WebCore/html/canvas/WebGL2RenderingContext.cpp:80 > > +#include <algorithm> > > Why this? std::find 1791378 4 ews-feeder 2021-09-07 23:43:09 -0700 Committed r282131 (241428@main): <https://commits.webkit.org/241428@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437486. 1791379 5 webkit-bug-importer 2021-09-07 23:44:18 -0700 <rdar://problem/82858538> 437486 2021-09-07 04:21:05 -0700 2021-09-07 23:43:09 -0700 Patch bug-229982-20210907142103.patch text/plain 13293 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ2ZTFlZWMwNjhiMWQz YzgyZGQ4NzBhYjc1Zjc3OTZhN2UxOTYwZi4uODQ2M2ZhYzg0OTMwZWM3NTFhZGRiY2FmNDIzNmE3 MWRmNTNlZGYxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTA5LTA3ICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgd2ViZ2wvMi4wLnkv ZGVxcC9mdW5jdGlvbmFsL2dsZXMzL25lZ2F0aXZlc3RhdGVhcGkuaHRtbCBnZXRfcXVlcnlfcGFy YW1ldGVyICBmYWlscyBvbiBNZXRhbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI5OTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hlY2sgdGhhdCB0aGUgcXVlcnkgYmVpbmcgcXVlcmllZCB3aXRoIGdl dFF1ZXJ5UGFyYW1ldGVyIGlzIG5vdCBwYXJ0CisgICAgICAgIG9mIHRoZSBjdXJyZW50bHkgYWN0 aXZlIHF1ZXJpZXMuCisKKyAgICAgICAgRmFpbGluZyBwYXJ0IG9mIHRoZSB0ZXN0OgorICAgICAg ICAgICAgICAgIGJ1ZmZlcmVkTG9nVG9Db25zb2xlKCdnbC5JTlZBTElEX09QRVJBVElPTiBpcyBn ZW5lcmF0ZWQgaWYgaWQgaXMgdGhlIG5hbWUgb2YgYSBjdXJyZW50bHkgYWN0aXZlIHF1ZXJ5IG9i amVjdC4nKTsKKyAgICAgICAgICAgICAgICBnbC5iZWdpblF1ZXJ5IChnbC5BTllfU0FNUExFU19Q QVNTRUQsIGlkKTsKKyAgICAgICAgICAgICAgICB0aGlzLmV4cGVjdEVycm9yIChnbC5OT19FUlJP Uik7CisgICAgICAgICAgICAgICAgZ2wuZ2V0UXVlcnlQYXJhbWV0ZXIgKGlkLCBnbC5RVUVSWV9S RVNVTFRfQVZBSUxBQkxFKTsKKyAgICAgICAgICAgICAgICB0aGlzLmV4cGVjdEVycm9yIChnbC5J TlZBTElEX09QRVJBVElPTik7CisKKyAgICAgICAgRml4ZXMgdGVzdDoKKyAgICAgICAgd2ViZ2wv Mi4wLnkvZGVxcC9mdW5jdGlvbmFsL2dsZXMzL25lZ2F0aXZlc3RhdGVhcGkuaHRtbAorCisgICAg ICAgICogaHRtbC9jYW52YXMvV2ViR0wyUmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXZWJHTDJSZW5kZXJpbmdDb250ZXh0Ojp+V2ViR0wyUmVuZGVyaW5nQ29udGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpXZWJHTDJSZW5kZXJpbmdDb250ZXh0OjpkZWxldGVRdWVyeSk6 CisgICAgICAgIChXZWJDb3JlOjpXZWJHTDJSZW5kZXJpbmdDb250ZXh0Ojp2YWxpZGF0ZVF1ZXJ5 VGFyZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmJlZ2lu UXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6ZW5kUXVl cnkpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6Z2V0UXVlcnkp OgorICAgICAgICAoV2ViQ29yZTo6V2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6Z2V0UXVlcnlQYXJh bWV0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6YWRkTWVt YmVyc1RvT3BhcXVlUm9vdHMpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMMlJlbmRlcmlu Z0NvbnRleHQuaDoKKyAgICAgICAgQ2hhbmdlIHRoZSAyLWVsZW1lbnQgSGFzaE1hcCB0byAyLWVs ZW1lbnQgYXJyYXkgZm9yIGVhc2Ugb2YKKyAgICAgICAgZW51bWVyYXRpb24gYW5kIHRyaXZpYWwg c2l6ZSBvcHRpbWl6YXRpb24uCisKIDIwMjEtMDktMDcgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51 bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJnbC8yLjAueS9kZXFwL2Z1bmN0aW9uYWwvZ2xl czMvbmVnYXRpdmVzdGF0ZWFwaS5odG1sIGdldF9mcmFtZWJ1ZmZlcl9hdHRhY2htZW50X3BhcmFt ZXRlciBmYWlscyBvbiBNZXRhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52 YXMvV2ViR0wyUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTDJSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCA4NjhkZmUyMTBiMTkxMzdlNjgyMDI2 MTZjZTVlOTFjNDQxYzFmMDNjLi40MzhiNDRhNWEyMzdhZjMwNWI2ODk1ZDU2YTliMWQ4MjkzYjg4 OTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTDJSZW5kZXJp bmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTDJSZW5k ZXJpbmdDb250ZXh0LmNwcApAQCAtNzcsNiArNzcsNyBAQAogI2luY2x1ZGUgPEphdmFTY3JpcHRD b3JlL1Nsb3RWaXNpdG9yLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU2xvdFZpc2l0b3JJ bmxpbmVzLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvVHlwZWRBcnJheVR5cGUuaD4KKyNp bmNsdWRlIDxhbGdvcml0aG0+CiAjaW5jbHVkZSA8d3RmL0lzb01hbGxvY0lubGluZXMuaD4KICNp bmNsdWRlIDx3dGYvTG9jay5oPgogI2luY2x1ZGUgPHd0Zi9Mb2NrZXIuaD4KQEAgLTEyOSw3ICsx MzAsOCBAQCBXZWJHTDJSZW5kZXJpbmdDb250ZXh0Ojp+V2ViR0wyUmVuZGVyaW5nQ29udGV4dCgp CiAgICAgbV9ib3VuZFRyYW5zZm9ybUZlZWRiYWNrQnVmZmVyID0gbnVsbHB0cjsKICAgICBtX2Jv dW5kVW5pZm9ybUJ1ZmZlciA9IG51bGxwdHI7CiAgICAgbV9ib3VuZEluZGV4ZWRVbmlmb3JtQnVm ZmVycy5jbGVhcigpOwotICAgIG1fYWN0aXZlUXVlcmllcy5jbGVhcigpOworICAgIGZvciAoYXV0 byYgYWN0aXZlUXVlcnkgOiBtX2FjdGl2ZVF1ZXJpZXMpCisgICAgICAgIGFjdGl2ZVF1ZXJ5ID0g bnVsbHB0cjsKIH0KIAogdm9pZCBXZWJHTDJSZW5kZXJpbmdDb250ZXh0Ojppbml0aWFsaXplTmV3 Q29udGV4dCgpCkBAIC0xOTE0LDkgKzE5MTYsMTQgQEAgdm9pZCBXZWJHTDJSZW5kZXJpbmdDb250 ZXh0OjpkZWxldGVRdWVyeShXZWJHTFF1ZXJ5KiBxdWVyeSkKIAogICAgIGlmIChpc0NvbnRleHRM b3N0T3JQZW5kaW5nKCkgfHwgIXF1ZXJ5IHx8ICFxdWVyeS0+b2JqZWN0KCkgfHwgIXZhbGlkYXRl V2ViR0xPYmplY3QoImRlbGV0ZVF1ZXJ5IiwgcXVlcnkpKQogICAgICAgICByZXR1cm47Ci0gICAg aWYgKHF1ZXJ5LT50YXJnZXQoKSAmJiBxdWVyeSA9PSBtX2FjdGl2ZVF1ZXJpZXMuZ2V0KHF1ZXJ5 LT50YXJnZXQoKSkpIHsKLSAgICAgICAgbV9jb250ZXh0LT5lbmRRdWVyeShxdWVyeS0+dGFyZ2V0 KCkpOwotICAgICAgICBtX2FjdGl2ZVF1ZXJpZXMucmVtb3ZlKHF1ZXJ5LT50YXJnZXQoKSk7Cisg ICAgaWYgKHF1ZXJ5LT50YXJnZXQoKSkgeworICAgICAgICBmb3IgKGF1dG8mIGFjdGl2ZVF1ZXJ5 IDogbV9hY3RpdmVRdWVyaWVzKSB7CisgICAgICAgICAgICBpZiAocXVlcnkgPT0gYWN0aXZlUXVl cnkpIHsKKyAgICAgICAgICAgICAgICBtX2NvbnRleHQtPmVuZFF1ZXJ5KHF1ZXJ5LT50YXJnZXQo KSk7CisgICAgICAgICAgICAgICAgYWN0aXZlUXVlcnkgPSBudWxscHRyOworICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogICAgIGRlbGV0ZU9i amVjdChsb2NrZXIsIHF1ZXJ5KTsKIH0KQEAgLTE5MzIsMzggKzE5MzksNDAgQEAgR0NHTGJvb2xl YW4gV2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6aXNRdWVyeShXZWJHTFF1ZXJ5KiBxdWVyeSkKICAg ICByZXR1cm4gbV9jb250ZXh0LT5pc1F1ZXJ5KHF1ZXJ5LT5vYmplY3QoKSk7CiB9CiAKLWJvb2wg V2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6dmFsaWRhdGVRdWVyeVRhcmdldChjb25zdCBjaGFyKiBm dW5jdGlvbk5hbWUsIEdDR0xlbnVtIHRhcmdldCwgR0NHTGVudW0qIHRhcmdldEtleSkKK3N0ZDo6 b3B0aW9uYWw8V2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6QWN0aXZlUXVlcnlLZXk+IFdlYkdMMlJl bmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRlUXVlcnlUYXJnZXQoY29uc3QgY2hhciogZnVuY3Rpb25O YW1lLCBHQ0dMZW51bSB0YXJnZXQpCiB7Ci0gICAgaWYgKHRhcmdldCAhPSBHcmFwaGljc0NvbnRl eHRHTDo6QU5ZX1NBTVBMRVNfUEFTU0VEICYmIHRhcmdldCAhPSBHcmFwaGljc0NvbnRleHRHTDo6 QU5ZX1NBTVBMRVNfUEFTU0VEX0NPTlNFUlZBVElWRSAmJiB0YXJnZXQgIT0gR3JhcGhpY3NDb250 ZXh0R0w6OlRSQU5TRk9STV9GRUVEQkFDS19QUklNSVRJVkVTX1dSSVRURU4pIHsKLSAgICAgICAg c3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0R0w6OklOVkFMSURfRU5VTSwgZnVuY3Rp b25OYW1lLCAiaW52YWxpZCB0YXJnZXQiKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHN3 aXRjaCAodGFyZ2V0KSB7CisgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6QU5ZX1NBTVBMRVNf UEFTU0VEOgorICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OkFOWV9TQU1QTEVTX1BBU1NFRF9D T05TRVJWQVRJVkU6CisgICAgICAgIHJldHVybiBBY3RpdmVRdWVyeUtleTo6U2FtcGxlc1Bhc3Nl ZDsKKyAgICBjYXNlIEdyYXBoaWNzQ29udGV4dEdMOjpUUkFOU0ZPUk1fRkVFREJBQ0tfUFJJTUlU SVZFU19XUklUVEVOOgorICAgICAgICByZXR1cm4gQWN0aXZlUXVlcnlLZXk6OlByaW1pdGl2ZXNX cml0dGVuOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICBpZiAodGFy Z2V0S2V5KQotICAgICAgICAqdGFyZ2V0S2V5ID0gKHRhcmdldCA9PSBHcmFwaGljc0NvbnRleHRH TDo6QU5ZX1NBTVBMRVNfUEFTU0VEX0NPTlNFUlZBVElWRSkgPyBHcmFwaGljc0NvbnRleHRHTDo6 QU5ZX1NBTVBMRVNfUEFTU0VEIDogdGFyZ2V0OwotICAgIHJldHVybiB0cnVlOworICAgIHN5bnRo ZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX0VOVU0sIGZ1bmN0aW9uTmFt ZSwgImludmFsaWQgdGFyZ2V0Iik7CisgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIH0KIAogdm9p ZCBXZWJHTDJSZW5kZXJpbmdDb250ZXh0OjpiZWdpblF1ZXJ5KEdDR0xlbnVtIHRhcmdldCwgV2Vi R0xRdWVyeSYgcXVlcnkpCiB7CiAgICAgTG9ja2VyIGxvY2tlciB7IG9iamVjdEdyYXBoTG9jaygp IH07Ci0KLSAgICBHQ0dMZW51bSB0YXJnZXRLZXk7Ci0gICAgaWYgKCF2YWxpZGF0ZVdlYkdMT2Jq ZWN0KCJiZWdpblF1ZXJ5IiwgJnF1ZXJ5KSB8fCAhdmFsaWRhdGVRdWVyeVRhcmdldCgiYmVnaW5R dWVyeSIsIHRhcmdldCwgJnRhcmdldEtleSkpCisgICAgaWYgKCF2YWxpZGF0ZVdlYkdMT2JqZWN0 KCJiZWdpblF1ZXJ5IiwgJnF1ZXJ5KSkKKyAgICAgICAgcmV0dXJuOworICAgIGF1dG8gYWN0aXZl UXVlcnlLZXkgPSB2YWxpZGF0ZVF1ZXJ5VGFyZ2V0KCJiZWdpblF1ZXJ5IiwgdGFyZ2V0KTsKKyAg ICBpZiAoIWFjdGl2ZVF1ZXJ5S2V5KQogICAgICAgICByZXR1cm47Ci0KICAgICBpZiAocXVlcnku dGFyZ2V0KCkgJiYgcXVlcnkudGFyZ2V0KCkgIT0gdGFyZ2V0KSB7CiAgICAgICAgIHN5bnRoZXNp emVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX09QRVJBVElPTiwgImJlZ2luUXVl cnkiLCAicXVlcnkgdHlwZSBkb2VzIG5vdCBtYXRjaCB0YXJnZXQiKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAotICAgIGF1dG8gYWRkUmVzdWx0ID0gbV9hY3RpdmVRdWVyaWVzLmFkZCh0YXJn ZXRLZXksIG1ha2VSZWZQdHIoJnF1ZXJ5KSk7Ci0KICAgICAvLyBPbmx5IG9uZSBxdWVyeSBvYmpl Y3QgY2FuIGJlIGFjdGl2ZSBwZXIgdGFyZ2V0LgotICAgIGlmICghYWRkUmVzdWx0LmlzTmV3RW50 cnkpIHsKLSAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0R0w6OklOVkFM SURfT1BFUkFUSU9OLCAiYmVnaW5RdWVyeSIsICJRdWVyeSBvYmplY3Qgb2YgdGFyZ2V0IGlzIGFs cmVhZHkgYWN0aXZlIik7CisgICAgaWYgKG1fYWN0aXZlUXVlcmllc1sqYWN0aXZlUXVlcnlLZXld KSB7CisgICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElE X09QRVJBVElPTiwgImJlZ2luUXVlcnkiLCAicXVlcnkgb2JqZWN0IG9mIHRhcmdldCBpcyBhbHJl YWR5IGFjdGl2ZSIpOwogICAgICAgICByZXR1cm47CiAgICAgfQotCisgICAgbV9hY3RpdmVRdWVy aWVzWyphY3RpdmVRdWVyeUtleV0gPSBtYWtlUmVmUHRyKCZxdWVyeSk7CiAgICAgbV9jb250ZXh0 LT5iZWdpblF1ZXJ5KHRhcmdldCwgcXVlcnkub2JqZWN0KCkpOwogICAgIHF1ZXJ5LnNldFRhcmdl dCh0YXJnZXQpOwogfQpAQCAtMTk3MSwyOSArMTk4MCwyOSBAQCB2b2lkIFdlYkdMMlJlbmRlcmlu Z0NvbnRleHQ6OmJlZ2luUXVlcnkoR0NHTGVudW0gdGFyZ2V0LCBXZWJHTFF1ZXJ5JiBxdWVyeSkK IHZvaWQgV2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6ZW5kUXVlcnkoR0NHTGVudW0gdGFyZ2V0KQog ewogICAgIExvY2tlciBsb2NrZXIgeyBvYmplY3RHcmFwaExvY2soKSB9OwotCi0gICAgR0NHTGVu dW0gdGFyZ2V0S2V5OwotICAgIGlmIChpc0NvbnRleHRMb3N0T3JQZW5kaW5nKCkgfHwgIXNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSB8fCAhdmFsaWRhdGVRdWVyeVRhcmdldCgiYmVnaW5RdWVyeSIs IHRhcmdldCwgJnRhcmdldEtleSkpCisgICAgaWYgKGlzQ29udGV4dExvc3RPclBlbmRpbmcoKSB8 fCAhc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKQogICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRv IHF1ZXJ5ID0gbV9hY3RpdmVRdWVyaWVzLnRha2UodGFyZ2V0S2V5KTsKLSAgICBpZiAoIXF1ZXJ5 KSB7Ci0gICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElE X09QRVJBVElPTiwgImVuZFF1ZXJ5IiwgIlF1ZXJ5IG9iamVjdCBvZiB0YXJnZXQgaXMgbm90IGFj dGl2ZSIpOworICAgIGF1dG8gYWN0aXZlUXVlcnlLZXkgPSB2YWxpZGF0ZVF1ZXJ5VGFyZ2V0KCJl bmRRdWVyeSIsIHRhcmdldCk7CisgICAgaWYgKCFhY3RpdmVRdWVyeUtleSkKKyAgICAgICAgcmV0 dXJuOworICAgIGlmICghbV9hY3RpdmVRdWVyaWVzWyphY3RpdmVRdWVyeUtleV0pIHsKKyAgICAg ICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0R0w6OklOVkFMSURfT1BFUkFUSU9O LCAiZW5kUXVlcnkiLCAicXVlcnkgb2JqZWN0IG9mIHRhcmdldCBpcyBub3QgYWN0aXZlIik7CiAg ICAgICAgIHJldHVybjsKICAgICB9Ci0KICAgICBtX2NvbnRleHQtPmVuZFF1ZXJ5KHRhcmdldCk7 CiAKICAgICAvLyBBIHF1ZXJ5J3MgcmVzdWx0IG11c3Qgbm90IGJlIG1hZGUgYXZhaWxhYmxlIHVu dGlsIGNvbnRyb2wgaGFzIHJldHVybmVkIHRvIHRoZSB1c2VyIGFnZW50J3MgbWFpbiBsb29wLgot ICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+ZXZlbnRMb29wKCkucXVldWVNaWNyb3Rhc2so W3F1ZXJ5XSB7CisgICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5ldmVudExvb3AoKS5xdWV1 ZU1pY3JvdGFzayhbcXVlcnkgPSBXVEZNb3ZlKG1fYWN0aXZlUXVlcmllc1sqYWN0aXZlUXVlcnlL ZXldKV0gewogICAgICAgICBxdWVyeS0+bWFrZVJlc3VsdEF2YWlsYWJsZSgpOwogICAgIH0pOwog fQogCiBSZWZQdHI8V2ViR0xRdWVyeT4gV2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6Z2V0UXVlcnko R0NHTGVudW0gdGFyZ2V0LCBHQ0dMZW51bSBwbmFtZSkKIHsKLSAgICBHQ0dMZW51bSB0YXJnZXRL ZXk7Ci0gICAgaWYgKGlzQ29udGV4dExvc3RPclBlbmRpbmcoKSB8fCAhc2NyaXB0RXhlY3V0aW9u Q29udGV4dCgpIHx8ICF2YWxpZGF0ZVF1ZXJ5VGFyZ2V0KCJiZWdpblF1ZXJ5IiwgdGFyZ2V0LCAm dGFyZ2V0S2V5KSkKKyAgICBpZiAoaXNDb250ZXh0TG9zdE9yUGVuZGluZygpIHx8ICFzY3JpcHRF eGVjdXRpb25Db250ZXh0KCkpCisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIGF1dG8gYWN0 aXZlUXVlcnlLZXkgPSB2YWxpZGF0ZVF1ZXJ5VGFyZ2V0KCJiZWdpblF1ZXJ5IiwgdGFyZ2V0KTsK KyAgICBpZiAoIWFjdGl2ZVF1ZXJ5S2V5KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAg IGlmIChwbmFtZSAhPSBHcmFwaGljc0NvbnRleHRHTDo6Q1VSUkVOVF9RVUVSWSkgewpAQCAtMjAw MSw3ICsyMDEwLDcgQEAgUmVmUHRyPFdlYkdMUXVlcnk+IFdlYkdMMlJlbmRlcmluZ0NvbnRleHQ6 OmdldFF1ZXJ5KEdDR0xlbnVtIHRhcmdldCwgR0NHTGVudW0gcG4KICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAgICAgfQogCi0gICAgYXV0byBxdWVyeSA9IG1fYWN0aXZlUXVlcmllcy5nZXQodGFy Z2V0S2V5KTsKKyAgICBhdXRvIHF1ZXJ5ID0gbV9hY3RpdmVRdWVyaWVzWyphY3RpdmVRdWVyeUtl eV07CiAgICAgaWYgKCFxdWVyeSB8fCBxdWVyeS0+dGFyZ2V0KCkgIT0gdGFyZ2V0KQogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4gcXVlcnk7CkBAIC0yMDExLDcgKzIwMjAsMTQg QEAgV2ViR0xBbnkgV2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6Z2V0UXVlcnlQYXJhbWV0ZXIoV2Vi R0xRdWVyeSYgcXVlcnksIEdDR0xlbnVtIHAKIHsKICAgICBpZiAoIXZhbGlkYXRlV2ViR0xPYmpl Y3QoImdldFF1ZXJ5UGFyYW1ldGVyIiwgJnF1ZXJ5KSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 Ci0KKyAgICBpZiAoIXF1ZXJ5LnRhcmdldCgpKSB7CisgICAgICAgIHN5bnRoZXNpemVHTEVycm9y KEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX09QRVJBVElPTiwgImdldFF1ZXJ5UGFyYW1ldGVy IiwgInF1ZXJ5IGhhcyBub3QgYmVlbiB1c2VkIGJ5IGJlZ2luUXVlcnkiKTsKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CisgICAgfQorICAgIGlmIChzdGQ6OmZpbmQoc3RkOjpiZWdpbihtX2FjdGl2 ZVF1ZXJpZXMpLCBzdGQ6OmVuZChtX2FjdGl2ZVF1ZXJpZXMpLCAmcXVlcnkpICE9IHN0ZDo6ZW5k KG1fYWN0aXZlUXVlcmllcykpIHsKKyAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3ND b250ZXh0R0w6OklOVkFMSURfT1BFUkFUSU9OLCAiZ2V0UXVlcnlQYXJhbWV0ZXIiLCAicXVlcnkg aXMgY3VycmVudGx5IGFjdGl2ZSIpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAg ICAgc3dpdGNoIChwbmFtZSkgewogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OlFVRVJZX1JF U1VMVDoKICAgICAgICAgaWYgKCFxdWVyeS5pc1Jlc3VsdEF2YWlsYWJsZSgpKQpAQCAtMjAyMiw3 ICsyMDM4LDcgQEAgV2ViR0xBbnkgV2ViR0wyUmVuZGVyaW5nQ29udGV4dDo6Z2V0UXVlcnlQYXJh bWV0ZXIoV2ViR0xRdWVyeSYgcXVlcnksIEdDR0xlbnVtIHAKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKLSAgICAgICAgc3ludGhlc2l6ZUdM RXJyb3IoR3JhcGhpY3NDb250ZXh0R0w6OklOVkFMSURfRU5VTSwgImdldFF1ZXJ5UGFyYW1ldGVy IiwgIkludmFsaWQgcG5hbWUiKTsKKyAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3ND b250ZXh0R0w6OklOVkFMSURfRU5VTSwgImdldFF1ZXJ5UGFyYW1ldGVyIiwgImludmFsaWQgcGFy YW1ldGVyIG5hbWUiKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCkBAIC0zMTMy LDcgKzMxNDgsNyBAQCB2b2lkIFdlYkdMMlJlbmRlcmluZ0NvbnRleHQ6OmFkZE1lbWJlcnNUb09w YXF1ZVJvb3RzKEpTQzo6QWJzdHJhY3RTbG90VmlzaXRvciYgdgogICAgICAgICB2aXNpdG9yLmFk ZE9wYXF1ZVJvb3QoYnVmZmVyLmdldCgpKTsKIAogICAgIGZvciAoYXV0byYgZW50cnkgOiBtX2Fj dGl2ZVF1ZXJpZXMpCi0gICAgICAgIHZpc2l0b3IuYWRkT3BhcXVlUm9vdChlbnRyeS52YWx1ZS5n ZXQoKSk7CisgICAgICAgIHZpc2l0b3IuYWRkT3BhcXVlUm9vdChlbnRyeS5nZXQoKSk7CiAKICAg ICBmb3IgKGF1dG8mIGVudHJ5IDogbV9ib3VuZFNhbXBsZXJzKQogICAgICAgICB2aXNpdG9yLmFk ZE9wYXF1ZVJvb3QoZW50cnkuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9jYW52YXMvV2ViR0wyUmVuZGVyaW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0wyUmVuZGVyaW5nQ29udGV4dC5oCmluZGV4IGEyYjAyZjNmMmQ3MDEyMGNjZDY3 MzAwMjdlZTYzMzBkMTlkNmIzMWMuLmE5ZmYwZmI0MTFiZjhlMTM5NGI5OTkyMDJhODM4NTM5ZmY2 OTgxYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMMlJlbmRl cmluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTDJSZW5k ZXJpbmdDb250ZXh0LmgKQEAgLTI5LDYgKzI5LDcgQEAKIAogI2luY2x1ZGUgIldlYkdMUmVuZGVy aW5nQ29udGV4dEJhc2UuaCIKICNpbmNsdWRlIDxtZW1vcnk+CisjaW5jbHVkZSA8b3B0aW9uYWw+ CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMjk5LDcgKzMwMCw4IEBAIHByaXZhdGU6CiAg ICAgV2ViR0xGcmFtZWJ1ZmZlciogZ2V0UmVhZEZyYW1lYnVmZmVyQmluZGluZygpIGZpbmFsOwog ICAgIHZvaWQgcmVzdG9yZUN1cnJlbnRGcmFtZWJ1ZmZlcigpIGZpbmFsOwogICAgIGJvb2wgdmFs aWRhdGVOb25EZWZhdWx0RnJhbWVidWZmZXJBdHRhY2htZW50KGNvbnN0IGNoYXIqIGZ1bmN0aW9u TmFtZSwgR0NHTGVudW0gYXR0YWNobWVudCk7Ci0gICAgYm9vbCB2YWxpZGF0ZVF1ZXJ5VGFyZ2V0 KGNvbnN0IGNoYXIqIGZ1bmN0aW9uTmFtZSwgR0NHTGVudW0gdGFyZ2V0LCBHQ0dMZW51bSogdGFy Z2V0S2V5KTsKKyAgICBlbnVtIEFjdGl2ZVF1ZXJ5S2V5IHsgU2FtcGxlc1Bhc3NlZCA9IDAsIFBy aW1pdGl2ZXNXcml0dGVuID0gMSwgTnVtS2V5cyA9IDIgfTsKKyAgICBzdGQ6Om9wdGlvbmFsPEFj dGl2ZVF1ZXJ5S2V5PiB2YWxpZGF0ZVF1ZXJ5VGFyZ2V0KGNvbnN0IGNoYXIqIGZ1bmN0aW9uTmFt ZSwgR0NHTGVudW0gdGFyZ2V0KTsKICAgICB2b2lkIHJlbmRlcmJ1ZmZlclN0b3JhZ2VJbXBsKEdD R0xlbnVtIHRhcmdldCwgR0NHTHNpemVpIHNhbXBsZXMsIEdDR0xlbnVtIGludGVybmFsZm9ybWF0 LCBHQ0dMc2l6ZWkgd2lkdGgsIEdDR0xzaXplaSBoZWlnaHQsIGNvbnN0IGNoYXIqIGZ1bmN0aW9u TmFtZSkgZmluYWw7CiAgICAgdm9pZCByZW5kZXJidWZmZXJTdG9yYWdlSGVscGVyKEdDR0xlbnVt IHRhcmdldCwgR0NHTHNpemVpIHNhbXBsZXMsIEdDR0xlbnVtIGludGVybmFsZm9ybWF0LCBHQ0dM c2l6ZWkgd2lkdGgsIEdDR0xzaXplaSBoZWlnaHQpOwogCkBAIC0zNDYsNyArMzQ4LDcgQEAgcHJp dmF0ZToKICAgICBSZWZQdHI8V2ViR0xCdWZmZXI+IG1fYm91bmRVbmlmb3JtQnVmZmVyOwogICAg IFZlY3RvcjxSZWZQdHI8V2ViR0xCdWZmZXI+PiBtX2JvdW5kSW5kZXhlZFVuaWZvcm1CdWZmZXJz OwogCi0gICAgSGFzaE1hcDxHQ0dMZW51bSwgUmVmUHRyPFdlYkdMUXVlcnk+PiBtX2FjdGl2ZVF1 ZXJpZXM7CisgICAgUmVmUHRyPFdlYkdMUXVlcnk+IG1fYWN0aXZlUXVlcmllc1tBY3RpdmVRdWVy eUtleTo6TnVtS2V5c107CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYkdMU2FtcGxlcj4+IG1fYm91 bmRTYW1wbGVyczsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGVhN2JiZmI0YThjZTNlNTY2NzNiYjg0Zjk4NWVkNzc5Y2Jh YWM4YTkuLmExZjQzMjYzMTZkYzZhZGQwYTg3NzMzMWI2YWUwNmNjYTlkNTViOTYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAyMS0wOS0wNyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBw bGUuY29tPgorCisgICAgICAgIHdlYmdsLzIuMC55L2RlcXAvZnVuY3Rpb25hbC9nbGVzMy9uZWdh dGl2ZXN0YXRlYXBpLmh0bWwgZ2V0X3F1ZXJ5X3BhcmFtZXRlciAgZmFpbHMgb24gTWV0YWwKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTk4MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSB3ZWJn bC8yLjAueS9kZXFwL2Z1bmN0aW9uYWwvZ2xlczMvbmVnYXRpdmVzdGF0ZWFwaS5odG1sCisgICAg ICAgIGV4cGxpY2l0bHkgdW50aWwgMi4wLnkgaXMgYWN0aXZhdGVkLgorCisgICAgICAgICogd2Vi Z2wvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wOS0wNyAgS2ltbW8gS2lubnVuZW4gIDxra2lu bnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmdsLzIuMC55L2RlcXAvZnVuY3Rpb25hbC9n bGVzMy9uZWdhdGl2ZXN0YXRlYXBpLmh0bWwgZ2V0X2ZyYW1lYnVmZmVyX2F0dGFjaG1lbnRfcGFy YW1ldGVyIGZhaWxzIG9uIE1ldGFsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJnbC9UZXN0 RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvd2ViZ2wvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAw ODA3N2Q2YzJlZjU4YmYyMmQxN2ZjODgyM2MyNjlkYzMwMTAzMjU5Li44MGY1YWVkNGY4OTQ4Yzkw ZmQ4ZTA2MTM2ZjFiNDE2ZjQzZjhkNGJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJnbC9U ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3dlYmdsL1Rlc3RFeHBlY3RhdGlvbnMK QEAgLTI1LDQgKzI1LDYgQEAgd2Via2l0Lm9yZy9iLzIyODcwMyB3ZWJnbC8yLjAuMC9kZXFwL2Z1 bmN0aW9uYWwvZ2xlczMvZmJvbXVsdGlzYW1wbGUuMl9zYW1wbGVzLmgKIHdlYmtpdC5vcmcvYi8y Mjg3MDMgd2ViZ2wvMi4wLjAvZGVxcC9mdW5jdGlvbmFsL2dsZXMzL2Zib211bHRpc2FtcGxlLjRf c2FtcGxlcy5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI4NzAzIHdlYmdsLzIuMC4w L2RlcXAvZnVuY3Rpb25hbC9nbGVzMy9mYm9tdWx0aXNhbXBsZS44X3NhbXBsZXMuaHRtbCBbIEZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyODcwMyB3ZWJnbC8yLjAuMC9kZXFwL2Z1bmN0aW9uYWwv Z2xlczMvc2hhZGVydGV4dHVyZWZ1bmN0aW9uL3RleHR1cmVncmFkLmh0bWwgWyBGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMjk5ODIgd2ViZ2wvMi4wLjAvZGVxcC9mdW5jdGlvbmFsL2dsZXMzL25l Z2F0aXZlc3RhdGVhcGkuaHRtbCBbIEZhaWx1cmUgXQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKKworIyBFeHBsaWNpdGx5IGVuYWJsZSB0ZXN0cyB3aGljaCB3ZSBoYXZlIGZpeGVkLiBUaGVz ZSBleHBlY3RhdGlvbnMgd2lsbCBiZSByZW1vdmVkIHdoZW4gMS4wLngvMi4wLnkgaXMgZW5hYmxl ZC4KK3dlYmdsLzIuMC55L2RlcXAvZnVuY3Rpb25hbC9nbGVzMy9uZWdhdGl2ZXN0YXRlYXBpLmh0 bWwgWyBQYXNzIF0K