224038 2021-03-31 20:30:29 -0700 Fix some missing exception checks in HTMLMediaElement methods. 2021-04-01 08:36:41 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim hi jer.noble mkwst philipj sergio webkit-bug-importer oldest_to_newest 1745937 0 mark.lam 2021-03-31 20:30:29 -0700 rdar://69573092 1745938 1 424870 mark.lam 2021-03-31 20:34:41 -0700 Created attachment 424870 proposed patch. 1746018 2 424870 eric.carlson 2021-04-01 07:37:37 -0700 Comment on attachment 424870 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=424870&action=review > Source/WebCore/html/HTMLMediaElement.cpp:7277 > + auto clearExceptionAndReturnFalse = [&] () -> bool { > + scope.clearException(); > + return false; > + }; I think we might as well report the exception unless you know of a reason not to. Failing setup here will change the page behavior, so logging something may help us diagnose user problems. 1746041 3 mark.lam 2021-04-01 08:36:41 -0700 Thanks for the review. (In reply to Eric Carlson from comment #2) > Comment on attachment 424870 [details] > proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=424870&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:7277 > > + auto clearExceptionAndReturnFalse = [&] () -> bool { > > + scope.clearException(); > > + return false; > > + }; > > I think we might as well report the exception unless you know of a reason > not to. Failing setup here will change the page behavior, so logging > something may help us diagnose user problems. I've applied this change. Landed in r275361: <http://trac.webkit.org/r275361>. 424870 2021-03-31 20:34:41 -0700 2021-04-01 07:37:37 -0700 proposed patch. bug-224038.patch text/plain 10068 mark.lam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3NTM0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTMxICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggc29tZSBtaXNzaW5nIGV4Y2Vw dGlvbiBjaGVja3MgaW4gSFRNTE1lZGlhRWxlbWVudCBtZXRob2RzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0MDM4CisgICAgICAgIHJkYXI6Ly82 OTU3MzA5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IG1lZGlhL21pc3NpbmctZXhjZXB0aW9uLWNoZWNrcy1pbi1IVE1MTWVkaWFFbGVtZW50 LW1ldGhvZHMuaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldHVwQW5kQ2FsbEpTKToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUNhcHRpb25Db250YWluZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm9sc0lu amVjdGVkU2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldENv bnRyb2xsZXJKU1Byb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OmRpZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3QpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudDo6dXBkYXRlTWVkaWFDb250cm9sc0FmdGVyUHJlc2VudGF0aW9uTW9kZUNoYW5nZSk6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpnZXRDdXJyZW50TWVkaWFDb250 cm9sc1N0YXR1cyk6CisKIDIwMjEtMDMtMzEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBh cHBsZS5jb20+CiAKICAgICAgICAgTGlzdCBvZiBleHRlbnRzIHNob3VsZCBiZSBib3VuZHMtY2hl Y2tlZCB3aGVuIGl0ZXJhdGluZyBkaXNwbGF5IGxpc3QgaXRlbXMKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMjc1MzIzKQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMx MSwxMSArNDMxMSw3IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6c2V0dXBBbmRDYWxsSlMoY28K ICAgICBhdXRvKiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+ KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KHdvcmxkKSk7CiAgICAgYXV0byYgdm0gPSBn bG9iYWxPYmplY3QtPnZtKCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayh2bSk7Ci0gICAg YXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogICAgIGF1dG8qIGxleGljYWxH bG9iYWxPYmplY3QgPSBnbG9iYWxPYmplY3Q7Ci0KLSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCBmYWxzZSk7Ci0KICAgICByZXR1cm4gdGFzaygqZ2xvYmFsT2JqZWN0LCAqbGV4aWNhbEds b2JhbE9iamVjdCwgc2NyaXB0Q29udHJvbGxlciwgd29ybGQpOwogfQogCkBAIC00MzM1LDcgKzQz MzEsMTcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVDYXB0aW9uQ29udAogICAgIHNl dHVwQW5kQ2FsbEpTKFt0aGlzXShKU0RPTUdsb2JhbE9iamVjdCYgZ2xvYmFsT2JqZWN0LCBKU0M6 OkpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBTY3JpcHRDb250cm9sbGVyJiwg RE9NV3JhcHBlcldvcmxkJikgewogICAgICAgICBhdXRvJiB2bSA9IGdsb2JhbE9iamVjdC52bSgp OwogICAgICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9DQVRDSF9TQ09QRSh2bSk7CisKKyAgICAg ICAgYXV0byByZXBvcnRFeGNlcHRpb25BbmRSZXR1cm5GYWxzZSA9IFsmXSAoKSAtPiBib29sIHsK KyAgICAgICAgICAgIGF1dG8qIGV4Y2VwdGlvbiA9IHNjb3BlLmV4Y2VwdGlvbigpOworICAgICAg ICAgICAgc2NvcGUuY2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgICAgIHJlcG9ydEV4Y2VwdGlv bigmZ2xvYmFsT2JqZWN0LCBleGNlcHRpb24pOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICB9OworCiAgICAgICAgIGF1dG8gY29udHJvbGxlclZhbHVlID0gY29udHJvbGxlckpT VmFsdWUobGV4aWNhbEdsb2JhbE9iamVjdCwgZ2xvYmFsT2JqZWN0LCAqdGhpcyk7CisgICAgICAg IFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHJlcG9ydEV4Y2VwdGlvbkFuZFJldHVybkZhbHNl KCkpOworCiAgICAgICAgIGF1dG8qIGNvbnRyb2xsZXJPYmplY3QgPSBKU0M6OmpzRHluYW1pY0Nh c3Q8SlNDOjpKU09iamVjdCo+KHZtLCBjb250cm9sbGVyVmFsdWUpOwogICAgICAgICBpZiAoIWNv bnRyb2xsZXJPYmplY3QpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC00MzQ3LDYgKzQz NTMsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUNhcHRpb25Db250CiAgICAgICAg IC8vIFJldHVybiB2YWx1ZToKICAgICAgICAgLy8gICAgIE5vbmUKICAgICAgICAgYXV0byBtZXRo b2RWYWx1ZSA9IGNvbnRyb2xsZXJPYmplY3QtPmdldCgmbGV4aWNhbEdsb2JhbE9iamVjdCwgSlND OjpJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAidXBkYXRlQ2FwdGlvbkNvbnRhaW5lciIpKTsK KyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgcmVwb3J0RXhjZXB0aW9uQW5kUmV0 dXJuRmFsc2UoKSk7CisKICAgICAgICAgYXV0byogbWV0aG9kT2JqZWN0ID0gSlNDOjpqc0R5bmFt aWNDYXN0PEpTQzo6SlNPYmplY3QqPih2bSwgbWV0aG9kVmFsdWUpOwogICAgICAgICBpZiAoIW1l dGhvZE9iamVjdCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTQzNTgsNyArNDM2Niw3 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlQ2FwdGlvbkNvbnQKICAgICAgICAgSlND OjpNYXJrZWRBcmd1bWVudEJ1ZmZlciBub0FyZ3VtZW50czsKICAgICAgICAgQVNTRVJUKCFub0Fy Z3VtZW50cy5oYXNPdmVyZmxvd2VkKCkpOwogICAgICAgICBKU0M6OmNhbGwoJmxleGljYWxHbG9i YWxPYmplY3QsIG1ldGhvZE9iamVjdCwgY2FsbERhdGEsIGNvbnRyb2xsZXJPYmplY3QsIG5vQXJn dW1lbnRzKTsKLSAgICAgICAgc2NvcGUuY2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgUkVUVVJO X0lGX0VYQ0VQVElPTihzY29wZSwgcmVwb3J0RXhjZXB0aW9uQW5kUmV0dXJuRmFsc2UoKSk7CiAK ICAgICAgICAgbV9oYXZlU2V0VXBDYXB0aW9uQ29udGFpbmVyID0gdHJ1ZTsKIApAQCAtNzE1Niw3 ICs3MTY0LDE1IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm8KICAg ICAgICAgYXV0byYgdm0gPSBnbG9iYWxPYmplY3Qudm0oKTsKICAgICAgICAgYXV0byBzY29wZSA9 IERFQ0xBUkVfQ0FUQ0hfU0NPUEUodm0pOwogCisgICAgICAgIGF1dG8gcmVwb3J0RXhjZXB0aW9u QW5kUmV0dXJuRmFsc2UgPSBbJl0gKCkgLT4gYm9vbCB7CisgICAgICAgICAgICBhdXRvKiBleGNl cHRpb24gPSBzY29wZS5leGNlcHRpb24oKTsKKyAgICAgICAgICAgIHNjb3BlLmNsZWFyRXhjZXB0 aW9uKCk7CisgICAgICAgICAgICByZXBvcnRFeGNlcHRpb24oJmdsb2JhbE9iamVjdCwgZXhjZXB0 aW9uKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfTsKKwogICAgICAgICBh dXRvIGZ1bmN0aW9uVmFsdWUgPSBnbG9iYWxPYmplY3QuZ2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0 LCBKU0M6OklkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJjcmVhdGVDb250cm9scyIpKTsKKyAg ICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgcmVwb3J0RXhjZXB0aW9uQW5kUmV0dXJu RmFsc2UoKSk7CiAgICAgICAgIGlmIChmdW5jdGlvblZhbHVlLmlzQ2FsbGFibGUodm0pKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTcxNjQsMTIgKzcxODAsNyBAQCBib29sIEhUTUxN ZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvCiAgICAgICAgICAgICBpZiAobWVkaWFDb250 cm9sc1NjcmlwdC5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAg ICAgICBzY3JpcHRDb250cm9sbGVyLmV2YWx1YXRlSW5Xb3JsZElnbm9yaW5nRXhjZXB0aW9uKFNj cmlwdFNvdXJjZUNvZGUobWVkaWFDb250cm9sc1NjcmlwdCksIHdvcmxkKTsKLSAgICAgICAgICAg IGlmIChVTkxJS0VMWShzY29wZS5leGNlcHRpb24oKSkpIHsKLSAgICAgICAgICAgICAgICBhdXRv KiBleGNlcHRpb24gPSBzY29wZS5leGNlcHRpb24oKTsKLSAgICAgICAgICAgICAgICBzY29wZS5j bGVhckV4Y2VwdGlvbigpOwotICAgICAgICAgICAgICAgIHJlcG9ydEV4Y2VwdGlvbigmZ2xvYmFs T2JqZWN0LCBleGNlcHRpb24pOwotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHJlcG9ydEV4 Y2VwdGlvbkFuZFJldHVybkZhbHNlKCkpOwogICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIHRy dWU7CkBAIC03MTk5LDcgKzcyMTAsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRDb250 cm9sbGVySlNQcgogewogICAgIHNldHVwQW5kQ2FsbEpTKFt0aGlzLCBwcm9wZXJ0eU5hbWUsIHBy b3BlcnR5VmFsdWVdKEpTRE9NR2xvYmFsT2JqZWN0JiBnbG9iYWxPYmplY3QsIEpTQzo6SlNHbG9i YWxPYmplY3QmIGxleGljYWxHbG9iYWxPYmplY3QsIFNjcmlwdENvbnRyb2xsZXImLCBET01XcmFw cGVyV29ybGQmKSB7CiAgICAgICAgIGF1dG8mIHZtID0gZ2xvYmFsT2JqZWN0LnZtKCk7CisgICAg ICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKwogICAgICAgICBhdXRv IGNvbnRyb2xsZXJWYWx1ZSA9IGNvbnRyb2xsZXJKU1ZhbHVlKGxleGljYWxHbG9iYWxPYmplY3Qs IGdsb2JhbE9iamVjdCwgKnRoaXMpOworICAgICAgICBFWENFUFRJT05fQVNTRVJUX1VOVVNFRChz Y29wZSwgIXNjb3BlLmV4Y2VwdGlvbigpIHx8IGNvbnRyb2xsZXJWYWx1ZS5pc051bGwoKSk7CiAg ICAgICAgIGlmIChjb250cm9sbGVyVmFsdWUuaXNOdWxsKCkpCiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAKQEAgLTcyMDgsNiArNzIyMiw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0 Q29udHJvbGxlckpTUHIKICAgICAgICAgaWYgKCFjb250cm9sbGVyT2JqZWN0KQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCisgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgY29u dHJvbGxlck9iamVjdC0+bWV0aG9kVGFibGUodm0pLT5wdXQoY29udHJvbGxlck9iamVjdCwgJmxl eGljYWxHbG9iYWxPYmplY3QsIEpTQzo6SWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgcHJvcGVy dHlOYW1lKSwgcHJvcGVydHlWYWx1ZSwgcHJvcGVydHlTbG90KTsKIAogICAgICAgICByZXR1cm4g dHJ1ZTsKQEAgLTcyNTYsOCArNzI3MSwxNCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFk ZFVzZXJBZ2VudFNoCiAgICAgICAgIGlmIChjYWxsRGF0YS50eXBlID09IEpTQzo6Q2FsbERhdGE6 OlR5cGU6Ok5vbmUpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICAgICAgYXV0byBj bGVhckV4Y2VwdGlvbkFuZFJldHVybkZhbHNlID0gWyZdICgpIC0+IGJvb2wgeworICAgICAgICAg ICAgc2NvcGUuY2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgfTsKKwogICAgICAgICBhdXRvIGNvbnRyb2xsZXJWYWx1ZSA9IEpTQzo6Y2FsbCgmbGV4 aWNhbEdsb2JhbE9iamVjdCwgZnVuY3Rpb24sIGNhbGxEYXRhLCAmZ2xvYmFsT2JqZWN0LCBhcmdM aXN0KTsKLSAgICAgICAgc2NvcGUuY2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgY2xlYXJFeGNlcHRpb25BbmRSZXR1cm5GYWxzZSgpKTsKKwogICAg ICAgICBhdXRvKiBjb250cm9sbGVyT2JqZWN0ID0gSlNDOjpqc0R5bmFtaWNDYXN0PEpTQzo6SlNP YmplY3QqPih2bSwgY29udHJvbGxlclZhbHVlKTsKICAgICAgICAgaWYgKCFjb250cm9sbGVyT2Jq ZWN0KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNzI4MiwxMCArNzMwMywxMCBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFkZFVzZXJBZ2VudFNoCiAgICAgICAgIG1lZGlhQ29u dHJvbHNIb3N0SlNXcmFwcGVyT2JqZWN0LT5wdXREaXJlY3Qodm0sIGNvbnRyb2xsZXIsIGNvbnRy b2xsZXJWYWx1ZSwgSlNDOjpQcm9wZXJ0eUF0dHJpYnV0ZTo6RG9udERlbGV0ZSB8IEpTQzo6UHJv cGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtIHwgSlNDOjpQcm9wZXJ0eUF0dHJpYnV0ZTo6UmVhZE9u bHkpOwogCiAgICAgICAgIHVwZGF0ZVBhZ2VTY2FsZUZhY3RvckpTUHJvcGVydHkoKTsKLSAgICAg ICAgdXBkYXRlVXNlc0xUUlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb25KU1Byb3BlcnR5KCk7 CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGNsZWFyRXhjZXB0aW9uQW5kUmV0 dXJuRmFsc2UoKSk7CiAKLSAgICAgICAgaWYgKFVOTElLRUxZKHNjb3BlLmV4Y2VwdGlvbigpKSkK LSAgICAgICAgICAgIHNjb3BlLmNsZWFyRXhjZXB0aW9uKCk7CisgICAgICAgIHVwZGF0ZVVzZXNM VFJVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uSlNQcm9wZXJ0eSgpOworICAgICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBjbGVhckV4Y2VwdGlvbkFuZFJldHVybkZhbHNlKCkpOwog CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0pOwpAQCAtNzMxNyw4ICs3MzM4LDggQEAgdm9p ZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVNZWRpYUNvbnRybwogICAgICAgICBhdXRvIHNjb3Bl ID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKICAgICAgICAgYXV0byBjb250cm9sbGVyVmFs dWUgPSBjb250cm9sbGVySlNWYWx1ZShsZXhpY2FsR2xvYmFsT2JqZWN0LCBnbG9iYWxPYmplY3Qs ICp0aGlzKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAg ICAgICBhdXRvKiBjb250cm9sbGVyT2JqZWN0ID0gY29udHJvbGxlclZhbHVlLnRvT2JqZWN0KCZs ZXhpY2FsR2xvYmFsT2JqZWN0KTsKLQogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBmYWxzZSk7CiAKICAgICAgICAgYXV0byBmdW5jdGlvblZhbHVlID0gY29udHJvbGxlck9iamVj dC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6OklkZW50aWZpZXI6OmZyb21TdHJpbmco dm0sICJoYW5kbGVQcmVzZW50YXRpb25Nb2RlQ2hhbmdlIikpOwpAQCAtNzM2MSw4ICs3MzgyLDgg QEAgU3RyaW5nIEhUTUxNZWRpYUVsZW1lbnQ6OmdldEN1cnJlbnRNZWRpYQogICAgICAgICBhdXRv IHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKICAgICAgICAgYXV0byBjb250cm9s bGVyVmFsdWUgPSBjb250cm9sbGVySlNWYWx1ZShsZXhpY2FsR2xvYmFsT2JqZWN0LCBnbG9iYWxP YmplY3QsICp0aGlzKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2Up OwogICAgICAgICBhdXRvKiBjb250cm9sbGVyT2JqZWN0ID0gY29udHJvbGxlclZhbHVlLnRvT2Jq ZWN0KCZsZXhpY2FsR2xvYmFsT2JqZWN0KTsKLQogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBmYWxzZSk7CiAKICAgICAgICAgYXV0byBmdW5jdGlvblZhbHVlID0gY29udHJvbGxl ck9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6OklkZW50aWZpZXI6OmZyb21T dHJpbmcodm0sICJnZXRDdXJyZW50Q29udHJvbHNTdGF0dXMiKSk7CkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biAyNzUzMjQpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxNCBAQAorMjAyMS0wMy0zMSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisK KyAgICAgICAgRml4IHNvbWUgbWlzc2luZyBleGNlcHRpb24gY2hlY2tzIGluIEhUTUxNZWRpYUVs ZW1lbnQgbWV0aG9kcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNDAzOAorICAgICAgICByZGFyOi8vNjk1NzMwOTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL21pc3NpbmctZXhjZXB0aW9u LWNoZWNrcy1pbi1IVE1MTWVkaWFFbGVtZW50LW1ldGhvZHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBtZWRpYS9taXNzaW5nLWV4Y2VwdGlvbi1jaGVja3MtaW4tSFRNTE1lZGlhRWxl bWVudC1tZXRob2RzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTMxICBNYXJrIExhbSAgPG1hcmsu bGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQbGFjYXRlIGV4Y2VwdGlvbiBjaGVjayB2YWxpZGF0 aW9uIGJlbG93IGNvbnZlcnRWYXJpYWRpY0FyZ3VtZW50cygpLgpJbmRleDogTGF5b3V0VGVzdHMv bWVkaWEvbWlzc2luZy1leGNlcHRpb24tY2hlY2tzLWluLUhUTUxNZWRpYUVsZW1lbnQtbWV0aG9k cy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvbWlzc2luZy1l eGNlcHRpb24tY2hlY2tzLWluLUhUTUxNZWRpYUVsZW1lbnQtbWV0aG9kcy1leHBlY3RlZC50eHQJ KG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvbWlzc2luZy1leGNlcHRpb24tY2hl Y2tzLWluLUhUTUxNZWRpYUVsZW1lbnQtbWV0aG9kcy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29w eSkKQEAgLTAsMCArMSBAQAorCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS9taXNzaW5nLWV4Y2Vw dGlvbi1jaGVja3MtaW4tSFRNTE1lZGlhRWxlbWVudC1tZXRob2RzLmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvbWVkaWEvbWlzc2luZy1leGNlcHRpb24tY2hlY2tzLWluLUhUTUxNZWRp YUVsZW1lbnQtbWV0aG9kcy5odG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL21lZGlh L21pc3NpbmctZXhjZXB0aW9uLWNoZWNrcy1pbi1IVE1MTWVkaWFFbGVtZW50LW1ldGhvZHMuaHRt bAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE3IEBACis8IURPQ1RZUEUgaHRtbD48IS0tIHdl YmtpdC10ZXN0LXJ1bm5lciBbIGpzY09wdGlvbnM9LS12YWxpZGF0ZUV4Y2VwdGlvbkNoZWNrcz10 cnVlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9q cy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+CisgICAg aWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsK KworICAgIGxldCBkMCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2F1ZGlvJyk7CisgICAgbGV0 IGQxID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgndHJhY2snKTsKKyAgICBkMC5hcHBlbmRDaGls ZChkMSk7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1w b3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K