7184 2006-02-10 18:42:04 -0800 WebKit ignores external (SYSTEM) entity definitions for XSLT content 2010-09-15 00:53:10 -0700 1 1 1 Unclassified WebKit XML 420+ Mac OS X 10.4 RESOLVED FIXED InRadar P2 Normal --- 5888 1 eric eric bugs-webkit nickshanks oldest_to_newest 32080 0 eric 2006-02-10 18:42:04 -0800 WebKit ignores external (SYSTEM) entity definitions for XSLT content I'm breaking this off of: http://bugzilla.opendarwin.org/show_bug.cgi?id=5888 to cover only XSLT support. Currently Firefox does not support external entity declarations on plain-old xml, so for now we're only supporting them for xslt (to match WinIE). This is tracked internally by: <rdar://problem/4271696> 32082 1 6402 eric 2006-02-10 18:55:40 -0800 Created attachment 6402 Fix. 32087 2 6402 hyatt 2006-02-11 00:10:43 -0800 Comment on attachment 6402 Fix. Changelog has SVG stuff in it. Make sure to remove that. Looks good. After fixing this, we should follow up and make the people who need this don't require the result document to be able to load DTDs too. 279443 3 abarth 2010-09-15 00:53:10 -0700 *** Bug 3300 has been marked as a duplicate of this bug. *** 6402 2006-02-10 18:55:40 -0800 2006-02-11 00:10:43 -0800 Fix. xslt.patch text/plain 8686 eric SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEyNzQ3 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMDYtMDIt MTAgIEVyaWMgU2VpZGVsICA8ZXNlaWRlbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20veG1sX3Rva2VuaXplci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpPZmZzZXRCdWZmZXI6Ok9mZnNldEJ1ZmZlcik6CisgICAgICAgIChX ZWJDb3JlOjpPZmZzZXRCdWZmZXI6OnJlYWRPdXRCeXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpz aG91bGRBbGxvd0V4dGVybmFsTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpvcGVuRnVuYyk6Cisg ICAgICAgIChXZWJDb3JlOjpyZWFkRnVuYyk6CisgICAgICAgIChXZWJDb3JlOjpjbG9zZUZ1bmMp OgorICAgICAgICAoV2ViQ29yZTo6c2V0TG9hZGVyRm9yTGliWE1MQ2FsbGJhY2tzKToKKyAgICAg ICAgKFdlYkNvcmU6OmNyZWF0ZVFTdHJpbmdQYXJzZXIpOgorICAgICAgICAoV2ViQ29yZTo6WE1M VG9rZW5pemVyOjpmaW5pc2gpOgorICAgICAgICAqIGRvbS94bWxfdG9rZW5pemVyLmg6CisgICAg ICAgICoga2NhbnZhcy9SZW5kZXJTVkdUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clNWR1RleHQ6OlJlbmRlclNWR1RleHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHVGV4 dDo6dHJhbnNsYXRpb25Gb3JBdHRyaWJ1dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNW R1RleHQ6OnJlbGF0aXZlQkJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdUZXh0Ojpn ZXRBYnNvbHV0ZVJlcGFpbnRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1RleHQ6 OnBhaW50KToKKyAgICAgICAgKiBrY2FudmFzL1JlbmRlclNWR1RleHQuaDoKKyAgICAgICAgKiBr aHRtbC94c2wveHNsX3N0eWxlc2hlZXRpbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhTTFN0 eWxlU2hlZXRJbXBsOjpwYXJzZVN0cmluZyk6CisgICAgICAgICoga2h0bWwveHNsL3hzbF9zdHls ZXNoZWV0aW1wbC5oOgorICAgICAgICAqIGtzdmcyL3N2Zy9TVkdUZXh0RWxlbWVudEltcGwuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U1ZHVGV4dEVsZW1lbnRJbXBsOjpTVkdUZXh0RWxlbWVudElt cGwpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVGV4dEVsZW1lbnRJbXBsOjpwYXJzZU1hcHBlZEF0 dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdUZXh0RWxlbWVudEltcGw6OmNyZWF0ZVJl bmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RleHRFbGVtZW50SW1wbDo6Y2hpbGRTaG91 bGRDcmVhdGVSZW5kZXJlcik6CisgICAgICAgICoga3N2ZzIvc3ZnL1NWR1RleHRFbGVtZW50SW1w bC5oOgorCiAyMDA2LTAyLTEwICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBIeWF0dApJbmRleDogZG9tL3htbF90b2tlbml6ZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBkb20veG1sX3Rva2VuaXplci5oCShyZXZpc2lvbiAxMjc0NykKKysrIGRvbS94bWxf dG9rZW5pemVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc0LDYgKzc0LDcgQEAgcHJpdmF0ZToKIFRv a2VuaXplciogbmV3WE1MVG9rZW5pemVyKERvY3VtZW50SW1wbCosIEZyYW1lVmlldyogPSAwKTsK ICNpZiBLSFRNTF9YU0xUCiB2b2lkKiB4bWxEb2NQdHJGb3JTdHJpbmcoY29uc3QgUVN0cmluZyYg c291cmNlLCBjb25zdCBRU3RyaW5nJiBVUkwgPSBRU3RyaW5nKCkpOwordm9pZCBzZXRMb2FkZXJG b3JMaWJYTUxDYWxsYmFja3MoRG9jTG9hZGVyKik7CiAjZW5kaWYKIEhhc2hNYXA8RE9NU3RyaW5n LCBET01TdHJpbmc+IHBhcnNlQXR0cmlidXRlcyhjb25zdCBET01TdHJpbmcmLCBib29sJiBhdHRy c09LKTsKIGJvb2wgcGFyc2VYTUxEb2N1bWVudEZyYWdtZW50KGNvbnN0IERPTVN0cmluZyYsIERv Y3VtZW50RnJhZ21lbnRJbXBsKiwgRWxlbWVudEltcGwqIHBhcmVudCA9IDApOwpJbmRleDogZG9t L3htbF90b2tlbml6ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGRvbS94bWxfdG9rZW5pemVyLmNwcAko cmV2aXNpb24gMTI3NDcpCisrKyBkb20veG1sX3Rva2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI0LDcgKzI0LDkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJ4bWxfdG9r ZW5pemVyLmgiCiAKKyNpbmNsdWRlICJDYWNoZS5oIgogI2luY2x1ZGUgIkNhY2hlZFNjcmlwdC5o IgorI2luY2x1ZGUgIktXUUxvYWRlci5oIgogI2luY2x1ZGUgIkRvY0xvYWRlci5oIgogI2luY2x1 ZGUgIkRvY3VtZW50RnJhZ21lbnRJbXBsLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRJbXBsLmgiCkBA IC00Myw2ICs0NSw4IEBACiAjaW5jbHVkZSA8bGlieG1sL3BhcnNlckludGVybmFscy5oPgogI2lu Y2x1ZGUgPGt4bWxjb3JlL1ZlY3Rvci5oPgogCisjaW5jbHVkZSA8a2lvL2pvYi5oPgorCiAjaWYg U1ZHX1NVUFBPUlQKICNpbmNsdWRlICJTVkdOYW1lcy5oIgogI2luY2x1ZGUgIlhMaW5rTmFtZXMu aCIKQEAgLTE1MiwxNCArMTU2LDU4IEBAIHN0YXRpYyBpbnQgbWF0Y2hGdW5jKGNvbnN0IGNoYXIq IHVyaSkKICAgICByZXR1cm4gMTsgLy8gTWF0Y2ggZXZlcnl0aGluZy4KIH0KIAotc3RhdGljIHZv aWQqIG9wZW5GdW5jKGNvbnN0IGNoYXIgKiB1cmkpIHsKLSAgICByZXR1cm4gJmdsb2JhbERlc2Ny aXB0b3I7CitzdGF0aWMga2h0bWw6OkRvY0xvYWRlciAqZ2xvYmFsRG9jTG9hZGVyID0gMDsKKwor Y2xhc3MgT2Zmc2V0QnVmZmVyIHsKK3B1YmxpYzoKKyAgICBPZmZzZXRCdWZmZXIoY29uc3QgQnl0 ZUFycmF5ICZiKSA6IG1fYnVmZmVyKGIpLCBtX2N1cnJlbnRPZmZzZXQoMCkgeyB9CisgICAgCisg ICAgaW50IHJlYWRPdXRCeXRlcyhjaGFyICpvdXRwdXRCdWZmZXIsIHVuc2lnbmVkIGFza2VkVG9S ZWFkKSB7CisgICAgICAgIHVuc2lnbmVkIGJ5dGVzTGVmdCA9IG1fYnVmZmVyLnNpemUoKSAtIG1f Y3VycmVudE9mZnNldDsKKyAgICAgICAgdW5zaWduZWQgbGVuVG9Db3B5ID0ga01pbihhc2tlZFRv UmVhZCwgYnl0ZXNMZWZ0KTsKKyAgICAgICAgaWYgKGxlblRvQ29weSkgeworICAgICAgICAgICAg bWVtY3B5KG91dHB1dEJ1ZmZlciwgbV9idWZmZXIuZGF0YSgpICsgbV9jdXJyZW50T2Zmc2V0LCBs ZW5Ub0NvcHkpOworICAgICAgICAgICAgbV9jdXJyZW50T2Zmc2V0ICs9IGxlblRvQ29weTsKKyAg ICAgICAgfQorICAgICAgICByZXR1cm4gbGVuVG9Db3B5OworICAgIH0KKworcHJpdmF0ZToKKyAg ICBCeXRlQXJyYXkgbV9idWZmZXI7CisgICAgdW5zaWduZWQgbV9jdXJyZW50T2Zmc2V0OworfTsK Kworc3RhdGljIGJvb2wgc2hvdWxkQWxsb3dFeHRlcm5hbExvYWQoY29uc3QgY2hhciogaW5VUkkp Cit7CisgICAgUVN0cmluZyB1cmwoaW5VUkkpOworICAgIGlmICh1cmwuY29udGFpbnMoIi9ldGMv Y2F0YWxvZyIpCisgICAgICAgIHx8IHVybC5zdGFydHNXaXRoKCJodHRwOi8vd3d3LnczLm9yZy9H cmFwaGljcy9TVkciKQorICAgICAgICB8fCB1cmwuc3RhcnRzV2l0aCgiaHR0cDovL3d3dy53My5v cmcvVFIveGh0bWwiKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiB0cnVlOwor fQorCitzdGF0aWMgdm9pZCogb3BlbkZ1bmMoY29uc3QgY2hhciogdXJpKQoreworICAgIGlmICgh Z2xvYmFsRG9jTG9hZGVyIHx8ICFzaG91bGRBbGxvd0V4dGVybmFsTG9hZCh1cmkpKQorICAgICAg ICByZXR1cm4gJmdsb2JhbERlc2NyaXB0b3I7CisKKyAgICBLVVJMIGZpbmFsVVJMOworICAgIEtJ Tzo6VHJhbnNmZXJKb2IgKmpvYiA9IEtJTzo6Z2V0KHVyaSwgdHJ1ZSwgZmFsc2UpOworICAgIFFT dHJpbmcgaGVhZGVyczsKKyAgICBCeXRlQXJyYXkgZGF0YSA9IEtXUVNlcnZlU3luY2hyb25vdXNS ZXF1ZXN0KENhY2hlOjpsb2FkZXIoKSwgZ2xvYmFsRG9jTG9hZGVyLCBqb2IsIGZpbmFsVVJMLCBo ZWFkZXJzKTsKKyAgICAKKyAgICByZXR1cm4gbmV3IE9mZnNldEJ1ZmZlcihkYXRhKTsKIH0KIAog c3RhdGljIGludCByZWFkRnVuYyh2b2lkKiBjb250ZXh0LCBjaGFyKiBidWZmZXIsIGludCBsZW4p CiB7Ci0gICAgLy8gQWx3YXlzIGp1c3QgZG8gMC1ieXRlIHJlYWRzCi0gICAgcmV0dXJuIDA7Cisg ICAgLy8gRG8gMC1ieXRlIHJlYWRzIGluIGNhc2Ugb2YgYSBudWxsIGRlc2NyaXB0b3IKKyAgICBp ZiAoY29udGV4dCA9PSAmZ2xvYmFsRGVzY3JpcHRvcikKKyAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIAorICAgIE9mZnNldEJ1ZmZlciAqZGF0YSA9IHN0YXRpY19jYXN0PE9mZnNldEJ1ZmZlciAq Pihjb250ZXh0KTsKKyAgICByZXR1cm4gZGF0YS0+cmVhZE91dEJ5dGVzKGJ1ZmZlciwgbGVuKTsK IH0KIAogc3RhdGljIGludCB3cml0ZUZ1bmModm9pZCogY29udGV4dCwgY29uc3QgY2hhciogYnVm ZmVyLCBpbnQgbGVuKQpAQCAtMTY4LDEzICsyMTYsMjcgQEAgc3RhdGljIGludCB3cml0ZUZ1bmMo dm9pZCogY29udGV4dCwgY29ucwogICAgIHJldHVybiAwOwogfQogCitzdGF0aWMgaW50IGNsb3Nl RnVuYyh2b2lkICogY29udGV4dCkKK3sKKyAgICBpZiAoY29udGV4dCAhPSAmZ2xvYmFsRGVzY3Jp cHRvcikgeworICAgICAgICBPZmZzZXRCdWZmZXIgKmRhdGEgPSBzdGF0aWNfY2FzdDxPZmZzZXRC dWZmZXIgKj4oY29udGV4dCk7CisgICAgICAgIGRlbGV0ZSBkYXRhOworICAgIH0KKyAgICByZXR1 cm4gMDsKK30KKwordm9pZCBzZXRMb2FkZXJGb3JMaWJYTUxDYWxsYmFja3MoRG9jTG9hZGVyICpk b2NMb2FkZXIpCit7CisgICAgZ2xvYmFsRG9jTG9hZGVyID0gZG9jTG9hZGVyOworfQorCiBzdGF0 aWMgeG1sUGFyc2VyQ3R4dFB0ciBjcmVhdGVRU3RyaW5nUGFyc2VyKHhtbFNBWEhhbmRsZXJQdHIg aGFuZGxlcnMsIHZvaWQgKnVzZXJEYXRhKQogewogICAgIHN0YXRpYyBib29sIGRpZEluaXQgPSBm YWxzZTsKICAgICBpZiAoIWRpZEluaXQpIHsKICAgICAgICAgeG1sSW5pdFBhcnNlcigpOwotICAg ICAgICB4bWxSZWdpc3RlcklucHV0Q2FsbGJhY2tzKG1hdGNoRnVuYywgb3BlbkZ1bmMsIHJlYWRG dW5jLCAwKTsKLSAgICAgICAgeG1sUmVnaXN0ZXJPdXRwdXRDYWxsYmFja3MobWF0Y2hGdW5jLCBv cGVuRnVuYywgd3JpdGVGdW5jLCAwKTsKKyAgICAgICAgeG1sUmVnaXN0ZXJJbnB1dENhbGxiYWNr cyhtYXRjaEZ1bmMsIG9wZW5GdW5jLCByZWFkRnVuYywgY2xvc2VGdW5jKTsKKyAgICAgICAgeG1s UmVnaXN0ZXJPdXRwdXRDYWxsYmFja3MobWF0Y2hGdW5jLCBvcGVuRnVuYywgd3JpdGVGdW5jLCBj bG9zZUZ1bmMpOwogICAgICAgICBkaWRJbml0ID0gdHJ1ZTsKICAgICB9CiAKQEAgLTc0OSw5ICs4 MTEsOSBAQCB2b2lkIFhNTFRva2VuaXplcjo6ZmluaXNoKCkKICAgICB4bWxGcmVlUGFyc2VyQ3R4 dChtX2NvbnRleHQpOwogICAgIG1fY29udGV4dCA9IDA7CiAKLSAgICBpZiAobV9zYXdFcnJvcikg eworICAgIGlmIChtX3Nhd0Vycm9yKQogICAgICAgICBpbnNlcnRFcnJvck1lc3NhZ2VCbG9jaygp OwotICAgIH0gZWxzZSB7CisgICAgZWxzZSB7CiAgICAgICAgIC8vIFBhcnNpbmcgd2FzIHN1Y2Nl c3NmdWwuIE5vdyBsb2NhdGUgYWxsIGh0bWwgPHNjcmlwdD4gdGFncyBpbiB0aGUgZG9jdW1lbnQg YW5kIGV4ZWN1dGUgdGhlbQogICAgICAgICAvLyBvbmUgYnkgb25lLgogICAgICAgICBleGl0VGV4 dCgpOwpJbmRleDoga2h0bWwveHNsL3hzbF9zdHlsZXNoZWV0aW1wbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0ga2h0bWwveHNsL3hzbF9zdHlsZXNoZWV0aW1wbC5jcHAJKHJldmlzaW9uIDEyNzQ3KQorKysg a2h0bWwveHNsL3hzbF9zdHlsZXNoZWV0aW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYg KzMxLDcgQEAKICNpbmNsdWRlICJDYWNoZWRYU0xTdHlsZVNoZWV0LmgiCiAjaW5jbHVkZSAiRG9j TG9hZGVyLmgiCiAjaW5jbHVkZSAieHNsX3N0eWxlc2hlZXRpbXBsLmgiCisjaW5jbHVkZSAieG1s X3Rva2VuaXplci5oIgogCiAjaW5jbHVkZSA8a2RlYnVnLmg+CiAKQEAgLTQwLDEwICs0MSw3IEBA CiAjZGVmaW5lIElTX0JMQU5LX05PREUobikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCiAgICAgKCgobiktPnR5cGUgPT0gWE1MX1RFWFRfTk9ERSkgJiYg KHhzbHRJc0JsYW5rKChuKS0+Y29udGVudCkpKQogCi11c2luZyBuYW1lc3BhY2Uga2h0bWw7Ci11 c2luZyBuYW1lc3BhY2UgRE9NOwotCi1uYW1lc3BhY2UgRE9NIHsKK25hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAKIFhTTFN0eWxlU2hlZXRJbXBsOjpYU0xTdHlsZVNoZWV0SW1wbChYU0xJbXBvcnRS dWxlSW1wbCAqcGFyZW50UnVsZSwgRE9NU3RyaW5nIGhyZWYpCiAgICAgOiBTdHlsZVNoZWV0SW1w bChwYXJlbnRSdWxlLCBocmVmKQpAQCAtMTE0LDEyICsxMTIsMTQgQEAgYm9vbCBYU0xTdHlsZVNo ZWV0SW1wbDo6cGFyc2VTdHJpbmcoY29ucwogICAgIC8vIFBhcnNlIGluIGEgc2luZ2xlIGNodW5r IGludG8gYW4geG1sRG9jUHRyCiAgICAgY29uc3QgUUNoYXIgQk9NKDB4RkVGRik7CiAgICAgY29u c3QgdW5zaWduZWQgY2hhciBCT01IaWdoQnl0ZSA9ICpyZWludGVycHJldF9jYXN0PGNvbnN0IHVu c2lnbmVkIGNoYXIgKj4oJkJPTSk7CisgICAgc2V0TG9hZGVyRm9yTGliWE1MQ2FsbGJhY2tzKGRv Y0xvYWRlcigpKTsKICAgICBtX3N0eWxlc2hlZXREb2MgPSB4bWxSZWFkTWVtb3J5KHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgY2hhciAqPihzdHJpbmcudW5pY29kZSgpKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0cmluZy5sZW5ndGgoKSAqIHNpemVvZihRQ2hhciksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX293bmVyRG9jdW1lbnQtPlVSTCgp LmFzY2lpKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBCT01IaWdoQnl0 ZSA9PSAweEZGID8gIlVURi0xNkxFIiA6ICJVVEYtMTZCRSIsIAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgWE1MX1BBUlNFX05PQ0RBVEF8WE1MX1BBUlNFX0RUREFUVFJ8WE1M X1BBUlNFX05PRU5UKTsKICAgICBsb2FkQ2hpbGRTaGVldHMoKTsKKyAgICBzZXRMb2FkZXJGb3JM aWJYTUxDYWxsYmFja3MoMCk7CiAgICAgcmV0dXJuIG1fc3R5bGVzaGVldERvYzsKIH0KIApJbmRl eDoga2h0bWwveHNsL3hzbF9zdHlsZXNoZWV0aW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtodG1sL3hz bC94c2xfc3R5bGVzaGVldGltcGwuaAkocmV2aXNpb24gMTI3NDcpCisrKyBraHRtbC94c2wveHNs X3N0eWxlc2hlZXRpbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDEzICszMSwxMCBAQAogCiAj aW5jbHVkZSA8bGlieHNsdC90cmFuc2Zvcm0uaD4KIAotbmFtZXNwYWNlIGtodG1sIHsKLSAgICBj bGFzcyBDYWNoZWRYU0xTdHlsZVNoZWV0OwotfTsKLQotbmFtZXNwYWNlIERPTSB7CituYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIFhTTEltcG9ydFJ1bGVJbXBsOworY2xhc3MgQ2FjaGVkWFNM U3R5bGVTaGVldDsKICAgICAKIGNsYXNzIFhTTFN0eWxlU2hlZXRJbXBsIDogcHVibGljIFN0eWxl U2hlZXRJbXBsCiB7CkBAIC02MCw3ICs1Nyw3IEBAIHB1YmxpYzoKIAogICAgIHhzbHRTdHlsZXNo ZWV0UHRyIGNvbXBpbGVTdHlsZVNoZWV0KCk7CiAKLSAgICBraHRtbDo6RG9jTG9hZGVyICpkb2NM b2FkZXIoKTsKKyAgICBEb2NMb2FkZXIgKmRvY0xvYWRlcigpOwogCiAgICAgRG9jdW1lbnRJbXBs KiBvd25lckRvY3VtZW50KCkgeyByZXR1cm4gbV9vd25lckRvY3VtZW50OyB9CiAgICAgdm9pZCBz ZXRPd25lckRvY3VtZW50KERvY3VtZW50SW1wbCogZG9jKSB7IG1fb3duZXJEb2N1bWVudCA9IGRv YzsgfQpAQCAtODIsNyArNzksNyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBtX3Byb2Nlc3NlZDsK IH07CiAKLWNsYXNzIFhTTEltcG9ydFJ1bGVJbXBsIDogcHVibGljIGtodG1sOjpDYWNoZWRPYmpl Y3RDbGllbnQsIHB1YmxpYyBTdHlsZUJhc2VJbXBsCitjbGFzcyBYU0xJbXBvcnRSdWxlSW1wbCA6 IHB1YmxpYyBDYWNoZWRPYmplY3RDbGllbnQsIHB1YmxpYyBTdHlsZUJhc2VJbXBsCiB7CiBwdWJs aWM6CiAgICAgWFNMSW1wb3J0UnVsZUltcGwoIFN0eWxlQmFzZUltcGwgKnBhcmVudCwgY29uc3Qg RE9NOjpET01TdHJpbmcgJmhyZWYpOwpAQCAtMTAzLDcgKzEwMCw3IEBAIHB1YmxpYzoKIHByb3Rl Y3RlZDoKICAgICBET01TdHJpbmcgbV9zdHJIcmVmOwogICAgIFJlZlB0cjxYU0xTdHlsZVNoZWV0 SW1wbD4gbV9zdHlsZVNoZWV0OwotICAgIGtodG1sOjpDYWNoZWRYU0xTdHlsZVNoZWV0KiBtX2Nh Y2hlZFNoZWV0OworICAgIENhY2hlZFhTTFN0eWxlU2hlZXQqIG1fY2FjaGVkU2hlZXQ7CiAgICAg Ym9vbCBtX2xvYWRpbmc7CiB9OwogCg==