163990 2016-10-25 15:17:04 -0700 Add ThrowScope::release() calls at all call sites of jsMakeNontrivialString(). 2016-10-25 15:57:23 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue darin keith_miller msaboff saam oldest_to_newest 1244478 0 mark.lam 2016-10-25 15:17:04 -0700 Patch coming. 1244486 1 292834 mark.lam 2016-10-25 15:27:44 -0700 Created attachment 292834 proposed patch. 1244487 2 292834 ggaren 2016-10-25 15:29:36 -0700 Comment on attachment 292834 proposed patch. r=me 1244491 3 mark.lam 2016-10-25 15:33:39 -0700 Thanks for the review. Landed in r207851: <http://trac.webkit.org/r207851>. 1244495 4 darin 2016-10-25 15:39:34 -0700 What’s the rule here? How can I be sure not to get this wrong in the future? Is the rule written down somewhere? 1244504 5 mark.lam 2016-10-25 15:45:12 -0700 (In reply to comment #4) > What’s the rule here? How can I be sure not to get this wrong in the future? > Is the rule written down somewhere? See the ChangeLog of r205569 for details on how the ExceptionScopes (ThrowScope and CatchScope) works: https://trac.webkit.org/changeset/205569/trunk/Source/JavaScriptCore/ChangeLog. We're gradually converting the code base to do the right thing. Once we've reach convergence, we'll turn on EXCEPTION_SCOPE_VERIFICATION on Debug builds. That should help us catch places where we're not doing the right thing. 1244507 6 darin 2016-10-25 15:57:23 -0700 Lets put a copy of that somewhere else. We are going to have to follow these rules for years. 292834 2016-10-25 15:27:44 -0700 2016-10-25 15:29:36 -0700 proposed patch. bug-163990.patch text/plain 9705 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3ODQ5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE2LTEwLTI1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgVGhyb3dTY29wZTo6cmVsZWFzZSgpIGNhbGxzIGF0IGFsbCBjYWxsIHNpdGVzIG9mIGpzTWFr ZU5vbnRyaXZpYWxTdHJpbmcoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE2Mzk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6 OmFycmF5UHJvdG9GdW5jVG9TdHJpbmcpOgorICAgICAgICAqIHJ1bnRpbWUvRXJyb3JQcm90b3R5 cGUuY3BwOgorICAgICAgICAoSlNDOjplcnJvclByb3RvRnVuY1RvU3RyaW5nKToKKyAgICAgICAg KiBydW50aW1lL0Z1bmN0aW9uUHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6ZnVuY3Rpb25Q cm90b0Z1bmNUb1N0cmluZyk6CisgICAgICAgICogcnVudGltZS9SZWdFeHBQcm90b3R5cGUuY3Bw OgorICAgICAgICAoSlNDOjpyZWdFeHBQcm90b0Z1bmNUb1N0cmluZyk6CisgICAgICAgICogcnVu dGltZS9TdHJpbmdQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpzdHJpbmdQcm90b0Z1bmNC aWcpOgorICAgICAgICAoSlNDOjpzdHJpbmdQcm90b0Z1bmNTbWFsbCk6CisgICAgICAgIChKU0M6 OnN0cmluZ1Byb3RvRnVuY0JsaW5rKToKKyAgICAgICAgKEpTQzo6c3RyaW5nUHJvdG9GdW5jQm9s ZCk6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY0ZpeGVkKToKKyAgICAgICAgKEpTQzo6 c3RyaW5nUHJvdG9GdW5jSXRhbGljcyk6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY1N0 cmlrZSk6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY1N1Yik6CisgICAgICAgIChKU0M6 OnN0cmluZ1Byb3RvRnVuY1N1cCk6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY0ZvbnRj b2xvcik6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY0ZvbnRzaXplKToKKyAgICAgICAg KEpTQzo6c3RyaW5nUHJvdG9GdW5jQW5jaG9yKToKKwogMjAxNi0xMC0yNSAgTWFyayBMYW0gIDxt YXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSlNTdHJpbmdKb2luZXI6OmpvaW5lZExlbmd0 aCgpIHNob3VsZCBsaW1pdCBqb2luZWQgc3RyaW5nIGxlbmd0aHMgdG8gSU5UX01BWC4KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJvdG90eXBlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAJ KHJldmlzaW9uIDIwNzg0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5 UHJvdG90eXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcyLDggKzM3MiwxMCBAQCBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGFycmF5UHJvdG9GCiAgICAgaWYgKGNhbGxUeXBlID09IENh bGxUeXBlOjpOb25lKQogICAgICAgICBjdXN0b21Kb2luQ2FzZSA9IHRydWU7CiAKLSAgICBpZiAo VU5MSUtFTFkoY3VzdG9tSm9pbkNhc2UpKQorICAgIGlmIChVTkxJS0VMWShjdXN0b21Kb2luQ2Fz ZSkpIHsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywgIltvYmplY3QgIiwgdGhpc09iamVj dC0+bWV0aG9kVGFibGUodm0pLT5jbGFzc05hbWUodGhpc09iamVjdCksICJdIikpOworICAgIH0K IAogICAgIC8vIDQuIFJldHVybiB0aGUgcmVzdWx0IG9mIGNhbGxpbmcgdGhlIFtbQ2FsbF1dIGlu dGVybmFsIG1ldGhvZCBvZiBmdW5jIHByb3ZpZGluZyBhcnJheSBhcyB0aGUgdGhpcyB2YWx1ZSBh bmQgYW4gZW1wdHkgYXJndW1lbnRzIGxpc3QuCiAgICAgaWYgKCFpc0pTQXJyYXkodGhpc09iamVj dCkgfHwgY2FsbFR5cGUgIT0gQ2FsbFR5cGU6Okhvc3QgfHwgY2FsbERhdGEubmF0aXZlLmZ1bmN0 aW9uICE9IGFycmF5UHJvdG9GdW5jSm9pbikKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0Vycm9yUHJvdG90eXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9FcnJvclByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDIwNzg0OSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9yUHJvdG90eXBlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTIwLDYgKzEyMCw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZXJy b3JQcm90b0YKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShuYW1lLmlzU3RyaW5nKCkg PyBuYW1lIDoganNTdHJpbmcoZXhlYywgbmFtZVN0cmluZykpOwogCiAgICAgLy8gMTAuIFJldHVy biB0aGUgcmVzdWx0IG9mIGNvbmNhdGVuYXRpbmcgbmFtZSwgIjoiLCBhIHNpbmdsZSBzcGFjZSBj aGFyYWN0ZXIsIGFuZCBtc2cuCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoanNNYWtlTm9udHJpdmlhbFN0cmluZyhleGVjLCBuYW1lU3RyaW5nLCAiOiAi LCBtZXNzYWdlU3RyaW5nKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0Z1bmN0aW9uUHJvdG90eXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9GdW5jdGlvblByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDIwNzg0OSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Z1bmN0aW9uUHJvdG90eXBlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtOTQsOCArOTQsMTAgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBmdW5jdGlvblBybwogICAgIEpTVmFsdWUgdGhpc1ZhbHVlID0gZXhlYy0+dGhpc1ZhbHVlKCk7 CiAgICAgaWYgKHRoaXNWYWx1ZS5pbmhlcml0cyhKU0Z1bmN0aW9uOjppbmZvKCkpKSB7CiAgICAg ICAgIEpTRnVuY3Rpb24qIGZ1bmN0aW9uID0ganNDYXN0PEpTRnVuY3Rpb24qPih0aGlzVmFsdWUp OwotICAgICAgICBpZiAoZnVuY3Rpb24tPmlzSG9zdE9yQnVpbHRpbkZ1bmN0aW9uKCkpCisgICAg ICAgIGlmIChmdW5jdGlvbi0+aXNIb3N0T3JCdWlsdGluRnVuY3Rpb24oKSkgeworICAgICAgICAg ICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShq c01ha2VOb250cml2aWFsU3RyaW5nKGV4ZWMsICJmdW5jdGlvbiAiLCBmdW5jdGlvbi0+bmFtZSh2 bSksICIoKSB7XG4gICAgW25hdGl2ZSBjb2RlXVxufSIpKTsKKyAgICAgICAgfQogCiAgICAgICAg IEZ1bmN0aW9uRXhlY3V0YWJsZSogZXhlY3V0YWJsZSA9IGZ1bmN0aW9uLT5qc0V4ZWN1dGFibGUo KTsKICAgICAgICAgaWYgKGV4ZWN1dGFibGUtPmlzQ2xhc3MoKSkgewpAQCAtMTA4LDExICsxMTAs MTMgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvblBybwogICAgICAgICBT dHJpbmdWaWV3IHNvdXJjZSA9IGV4ZWN1dGFibGUtPnNvdXJjZSgpLnByb3ZpZGVyKCktPmdldFJh bmdlKAogICAgICAgICAgICAgZXhlY3V0YWJsZS0+cGFyYW1ldGVyc1N0YXJ0T2Zmc2V0KCksCiAg ICAgICAgICAgICBleGVjdXRhYmxlLT5wYXJhbWV0ZXJzU3RhcnRPZmZzZXQoKSArIGV4ZWN1dGFi bGUtPnNvdXJjZSgpLmxlbmd0aCgpKTsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywgZnVu Y3Rpb25IZWFkZXIsIGZ1bmN0aW9uLT5uYW1lKHZtKSwgc291cmNlKSk7CiAgICAgfQogCiAgICAg aWYgKHRoaXNWYWx1ZS5pbmhlcml0cyhJbnRlcm5hbEZ1bmN0aW9uOjppbmZvKCkpKSB7CiAgICAg ICAgIEludGVybmFsRnVuY3Rpb24qIGZ1bmN0aW9uID0gYXNJbnRlcm5hbEZ1bmN0aW9uKHRoaXNW YWx1ZSk7CisgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6 OmVuY29kZShqc01ha2VOb250cml2aWFsU3RyaW5nKGV4ZWMsICJmdW5jdGlvbiAiLCBmdW5jdGlv bi0+bmFtZSgpLCAiKCkge1xuICAgIFtuYXRpdmUgY29kZV1cbn0iKSk7CiAgICAgfQogCkBAIC0x MjEsOCArMTI1LDEwIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25Qcm8K ICAgICAgICAgaWYgKG9iamVjdC0+aW5saW5lVHlwZUZsYWdzKCkgJiBUeXBlT2ZTaG91bGRDYWxs R2V0Q2FsbERhdGEpIHsKICAgICAgICAgICAgIENhbGxEYXRhIGNhbGxEYXRhOwogICAgICAgICAg ICAgaWYgKG9iamVjdC0+bWV0aG9kVGFibGUodm0pLT5nZXRDYWxsRGF0YShvYmplY3QsIGNhbGxE YXRhKSAhPSBDYWxsVHlwZTo6Tm9uZSkgewotICAgICAgICAgICAgICAgIGlmIChhdXRvKiBjbGFz c0luZm8gPSBvYmplY3QtPmNsYXNzSW5mbygpKQorICAgICAgICAgICAgICAgIGlmIChhdXRvKiBj bGFzc0luZm8gPSBvYmplY3QtPmNsYXNzSW5mbygpKSB7CisgICAgICAgICAgICAgICAgICAgIHNj b3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShqc01ha2VOb250cml2aWFsU3RyaW5nKGV4ZWMsICJmdW5jdGlvbiAiLCBjbGFzc0luZm8tPmNs YXNzTmFtZSwgIigpIHtcbiAgICBbbmF0aXZlIGNvZGVdXG59IikpOworICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1JlZ0V4cFByb3RvdHlwZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwUHJvdG90eXBlLmNwcAkocmV2aXNpb24gMjA3 ODQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwUHJvdG90eXBlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjQxLDYgKzI0MSw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwgcmVnRXhwUHJvdG8KICAgICBTdHJpbmcgZmxhZ3MgPSBmbGFnc1ZhbHVlLnRvU3Ry aW5nKGV4ZWMpLT52YWx1ZShleGVjKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBl bmNvZGVkSlNWYWx1ZSgpKTsKIAorICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNW YWx1ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywgJy8nLCBzb3VyY2UsICcv JywgZmxhZ3MpKTsKIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3Ry aW5nUHJvdG90eXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCShyZXZpc2lvbiAyMDc4NDkpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNDk3LDYgKzE0OTcsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1By b3RvCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMsIHNjb3BlKTsKICAgICBT dHJpbmcgcyA9IHRoaXNWYWx1ZS50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYyk7CiAgICAgUkVU VVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgc2NvcGUucmVs ZWFzZSgpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNNYWtlTm9udHJpdmlhbFN0cmlu ZyhleGVjLCAiPGJpZz4iLCBzLCAiPC9iaWc+IikpOwogfQogCkBAIC0xNTEwLDYgKzE1MTEsNyBA QCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvCiAgICAgICAgIHJldHVy biB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMsIHNjb3BlKTsKICAgICBTdHJpbmcgcyA9IHRoaXNWYWx1 ZS50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYyk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNNYWtlTm9udHJpdmlhbFN0cmluZyhleGVjLCAiPHNtYWxsPiIs IHMsICI8L3NtYWxsPiIpKTsKIH0KIApAQCAtMTUyMyw2ICsxNTI1LDcgQEAgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90bwogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVF cnJvcihleGVjLCBzY29wZSk7CiAgICAgU3RyaW5nIHMgPSB0aGlzVmFsdWUudG9TdHJpbmcoZXhl YyktPnZhbHVlKGV4ZWMpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRK U1ZhbHVlKCkpOworICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywgIjxibGluaz4iLCBzLCAiPC9ibGluaz4i KSk7CiB9CiAKQEAgLTE1MzYsNiArMTUzOSw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwgc3RyaW5nUHJvdG8KICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYywgc2Nv cGUpOwogICAgIFN0cmluZyBzID0gdGhpc1ZhbHVlLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVj KTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKKyAg ICBzY29wZS5yZWxlYXNlKCk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc01ha2VOb250 cml2aWFsU3RyaW5nKGV4ZWMsICI8Yj4iLCBzLCAiPC9iPiIpKTsKIH0KIApAQCAtMTU0OSw2ICsx NTUzLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90bwogICAgICAg ICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjLCBzY29wZSk7CiAgICAgU3RyaW5nIHMgPSB0 aGlzVmFsdWUudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpOwogICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworICAgIHNjb3BlLnJlbGVhc2UoKTsKICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywgIjx0 dD4iLCBzLCAiPC90dD4iKSk7CiB9CiAKQEAgLTE1NjIsNiArMTU2Nyw3IEBAIEVuY29kZWRKU1Zh bHVlIEpTQ19IT1NUX0NBTEwgc3RyaW5nUHJvdG8KICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBl RXJyb3IoZXhlYywgc2NvcGUpOwogICAgIFN0cmluZyBzID0gdGhpc1ZhbHVlLnRvU3RyaW5nKGV4 ZWMpLT52YWx1ZShleGVjKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVk SlNWYWx1ZSgpKTsKKyAgICBzY29wZS5yZWxlYXNlKCk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVu Y29kZShqc01ha2VOb250cml2aWFsU3RyaW5nKGV4ZWMsICI8aT4iLCBzLCAiPC9pPiIpKTsKIH0K IApAQCAtMTU3NSw2ICsxNTgxLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJp bmdQcm90bwogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjLCBzY29wZSk7CiAg ICAgU3RyaW5nIHMgPSB0aGlzVmFsdWUudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpOwogICAg IFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworICAgIHNjb3Bl LnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxT dHJpbmcoZXhlYywgIjxzdHJpa2U+IiwgcywgIjwvc3RyaWtlPiIpKTsKIH0KIApAQCAtMTU4OCw2 ICsxNTk1LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90bwogICAg ICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjLCBzY29wZSk7CiAgICAgU3RyaW5nIHMg PSB0aGlzVmFsdWUudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpOwogICAgIFJFVFVSTl9JRl9F WENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworICAgIHNjb3BlLnJlbGVhc2UoKTsK ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywg IjxzdWI+IiwgcywgIjwvc3ViPiIpKTsKIH0KIApAQCAtMTYwMSw2ICsxNjA5LDcgQEAgRW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90bwogICAgICAgICByZXR1cm4gdGhyb3dW TVR5cGVFcnJvcihleGVjLCBzY29wZSk7CiAgICAgU3RyaW5nIHMgPSB0aGlzVmFsdWUudG9TdHJp bmcoZXhlYyktPnZhbHVlKGV4ZWMpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVu Y29kZWRKU1ZhbHVlKCkpOworICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1 ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZpYWxTdHJpbmcoZXhlYywgIjxzdXA+IiwgcywgIjwvc3Vw PiIpKTsKIH0KIApAQCAtMTYxOSw2ICsxNjI4LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1Rf Q0FMTCBzdHJpbmdQcm90bwogICAgIFN0cmluZyBjb2xvciA9IGEwLnRvV1RGU3RyaW5nKGV4ZWMp OwogICAgIGNvbG9yLnJlcGxhY2VXaXRoTGl0ZXJhbCgnIicsICImcXVvdDsiKTsKIAorICAgIHNj b3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTWFrZU5vbnRyaXZp YWxTdHJpbmcoZXhlYywgIjxmb250IGNvbG9yPVwiIiwgY29sb3IsICJcIj4iLCBzLCAiPC9mb250 PiIpKTsKIH0KIApAQCAtMTY3Myw2ICsxNjgzLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1Rf Q0FMTCBzdHJpbmdQcm90bwogICAgIFN0cmluZyBmb250U2l6ZSA9IGEwLnRvV1RGU3RyaW5nKGV4 ZWMpOwogICAgIGZvbnRTaXplLnJlcGxhY2VXaXRoTGl0ZXJhbCgnIicsICImcXVvdDsiKTsKIAor ICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTWFrZU5v bnRyaXZpYWxTdHJpbmcoZXhlYywgIjxmb250IHNpemU9XCIiLCBmb250U2l6ZSwgIlwiPiIsIHMs ICI8L2ZvbnQ+IikpOwogfQogCkBAIC0xNjkxLDYgKzE3MDIsNyBAQCBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvCiAgICAgU3RyaW5nIGFuY2hvciA9IGEwLnRvV1RGU3Ry aW5nKGV4ZWMpOwogICAgIGFuY2hvci5yZXBsYWNlV2l0aExpdGVyYWwoJyInLCAiJnF1b3Q7Iik7 CiAKKyAgICBzY29wZS5yZWxlYXNlKCk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc01h a2VOb250cml2aWFsU3RyaW5nKGV4ZWMsICI8YSBuYW1lPVwiIiwgYW5jaG9yLCAiXCI+Iiwgcywg IjwvYT4iKSk7CiB9CiAK