6107 2005-12-16 02:04:56 -0800 Decoder should use Shared<T> and clients should use RefPtr<Decoder> 2005-12-20 01:04:47 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P4 Normal --- 1 eric eric oldest_to_newest 26035 0 eric 2005-12-16 02:04:56 -0800 Decoder should use Shared<T> and clients should use RefPtr<Decoder> Patch attached. 26041 1 5107 eric 2005-12-16 02:13:51 -0800 Created attachment 5107 Proposed patch. 26050 2 5107 darin 2005-12-16 07:11:08 -0800 Comment on attachment 5107 Proposed patch. Looks fine, although I don't think ~DocumentImpl needs to explicitly set m_decoder to 0 any more. r=me 26136 3 darin 2005-12-18 14:19:48 -0800 The changes from bug 6107 introduce one more cases where Decoder is used, which will need to be revised to be compatible with this fix. 26137 4 eric 2005-12-18 14:25:20 -0800 Will do. 26243 5 eric 2005-12-20 01:04:47 -0800 Fixed. 5107 2005-12-16 02:13:51 -0800 2005-12-16 07:11:08 -0800 Proposed patch. decoder_ref.patch text/plain 8733 eric SW5kZXg6IGtodG1sX3BhcnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJD b3JlL2todG1sL2todG1sX3BhcnQuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjM2NwpkaWZm IC1wIC11IC1yMS4zNjcga2h0bWxfcGFydC5jcHAKLS0tIGtodG1sX3BhcnQuY3BwCTE1IERlYyAy MDA1IDIyOjMxOjIzIC0wMDAwCTEuMzY3CisrKyBraHRtbF9wYXJ0LmNwcAkxNiBEZWMgMjAwNSAx MDoxMjowNyAtMDAwMApAQCAtNjc0LDggKzY3NCw2IEBAIHZvaWQgS0hUTUxQYXJ0OjpjbGVhcigp CiAgICAgZC0+bV9kb2MtPmRlcmVmKCk7CiAgIGQtPm1fZG9jID0gMDsKIAotICBpZiAoZC0+bV9k ZWNvZGVyKQotICAgIGQtPm1fZGVjb2Rlci0+ZGVyZWYoKTsKICAgZC0+bV9kZWNvZGVyID0gMDsK IAogICB7CkBAIC05MTksNyArOTE3LDcgQEAgdm9pZCBLSFRNTFBhcnQ6OmJlZ2luKCBjb25zdCBL VVJMICZ1cmwsIAogICAvLyBhYm91dCB0byBsb2FkIGEgbmV3IHBhZ2UuCiAgIGQtPm1fZG9jLT5z ZXRCYXNlVVJMKCBiYXNldXJsLnVybCgpICk7CiAgIGlmIChkLT5tX2RlY29kZXIpCi0gICAgZC0+ bV9kb2MtPnNldERlY29kZXIoZC0+bV9kZWNvZGVyKTsKKyAgICBkLT5tX2RvYy0+c2V0RGVjb2Rl cihkLT5tX2RlY29kZXIuZ2V0KCkpOwogICBkLT5tX2RvYy0+ZG9jTG9hZGVyKCktPnNldFNob3dB bmltYXRpb25zKCBkLT5tX3NldHRpbmdzLT5zaG93QW5pbWF0aW9ucygpICk7CiAKICAgS1dRKHRo aXMpLT51cGRhdGVQb2xpY3lCYXNlVVJMKCk7CkBAIC05NTMsNyArOTUxLDcgQEAgdm9pZCBLSFRN TFBhcnQ6OndyaXRlKCBjb25zdCBjaGFyICpzdHIsIAogICAgICAgICAgICAgZC0+bV9kZWNvZGVy LT5zZXRFbmNvZGluZyhkZWZhdWx0RW5jb2RpbmcsIERlY29kZXI6OkRlZmF1bHRFbmNvZGluZyk7 CiAgICAgICAgIH0KICAgICAgICAgaWYgKGQtPm1fZG9jKQotICAgICAgICAgICAgZC0+bV9kb2Mt PnNldERlY29kZXIoZC0+bV9kZWNvZGVyKTsKKyAgICAgICAgICAgIGQtPm1fZG9jLT5zZXREZWNv ZGVyKGQtPm1fZGVjb2Rlci5nZXQoKSk7CiAgICAgfQogICBpZiAoIGxlbiA9PSAwICkKICAgICBy ZXR1cm47CkluZGV4OiBraHRtbHBhcnRfcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9v dC9XZWJDb3JlL2todG1sL2todG1scGFydF9wLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjQK ZGlmZiAtcCAtdSAtcjEuNjQga2h0bWxwYXJ0X3AuaAotLS0ga2h0bWxwYXJ0X3AuaAkxNSBEZWMg MjAwNSAyMjozMToyOCAtMDAwMAkxLjY0CisrKyBraHRtbHBhcnRfcC5oCTE2IERlYyAyMDA1IDEw OjEyOjA4IC0wMDAwCkBAIC0xMDEsNyArMTAxLDYgQEAgcHVibGljOgogICBLSFRNTFBhcnRQcml2 YXRlKFFPYmplY3QqIHBhcmVudCkKICAgewogICAgIG1fZG9jID0gMEw7Ci0gICAgbV9kZWNvZGVy ID0gMEw7CiAgICAgbV9qc2NyaXB0ID0gMEw7CiAgICAgbV9ydW5uaW5nU2NyaXB0cyA9IDA7CiAg ICAgbV9qb2IgPSAwTDsKQEAgLTE5Nyw3ICsxOTYsNyBAQCBwdWJsaWM6CiAgIEtIVE1MUGFydEJy b3dzZXJFeHRlbnNpb24gKm1fZXh0ZW5zaW9uOwogICBLSFRNTFBhcnRCcm93c2VySG9zdEV4dGVu c2lvbiAqbV9ob3N0RXh0ZW5zaW9uOwogICBET006OkRvY3VtZW50SW1wbCAqbV9kb2M7Ci0gIGto dG1sOjpEZWNvZGVyICptX2RlY29kZXI7CisgIFJlZlB0cjxraHRtbDo6RGVjb2Rlcj4gbV9kZWNv ZGVyOwogICBRU3RyaW5nIG1fZW5jb2Rpbmc7CiAgIFFTdHJpbmcgbV9zaGVldFVzZWQ7CiAjaWYg IUFQUExFX0NBTkdFUwpJbmRleDogZWNtYS94bWxodHRwcmVxdWVzdC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS Q1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvZWNtYS94bWxodHRwcmVxdWVzdC5jcHAs dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNTEKZGlmZiAtcCAtdSAtcjEuNTEgZWNtYS94bWxodHRw cmVxdWVzdC5jcHAKLS0tIGVjbWEveG1saHR0cHJlcXVlc3QuY3BwCTExIERlYyAyMDA1IDAyOjA2 OjA4IC0wMDAwCTEuNTEKKysrIGVjbWEveG1saHR0cHJlcXVlc3QuY3BwCTE2IERlYyAyMDA1IDEw OjEyOjE2IC0wMDAwCkBAIC0yMjgsNyArMjI4LDYgQEAgWE1MSHR0cFJlcXVlc3Q6OlhNTEh0dHBS ZXF1ZXN0KEV4ZWNTdGF0ZQogICAgIGFzeW5jKHRydWUpLAogICAgIGpvYigwKSwKICAgICBzdGF0 ZShVbmluaXRpYWxpemVkKSwKLSAgICBkZWNvZGVyKDApLAogICAgIGNyZWF0ZWREb2N1bWVudChm YWxzZSksCiAgICAgYWJvcnRlZChmYWxzZSkKIHsKQEAgLTIzNywxMCArMjM2LDcgQEAgWE1MSHR0 cFJlcXVlc3Q6OlhNTEh0dHBSZXF1ZXN0KEV4ZWNTdGF0ZQogCiBYTUxIdHRwUmVxdWVzdDo6flhN TEh0dHBSZXF1ZXN0KCkKIHsKLSAgZGVsZXRlIHFPYmplY3Q7Ci0gIGlmIChkZWNvZGVyKSB7Ci0g ICAgZGVjb2Rlci0+ZGVyZWYoKTsKLSAgfQorICAgIGRlbGV0ZSBxT2JqZWN0OwogfQogCiB2b2lk IFhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0ZShYTUxIdHRwUmVxdWVzdFN0YXRlIG5ld1N0YXRl KQpAQCAtMjUwLDIwICsyNDYsMTYgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y2hhbmdlU3RhdGUo WE1MSHR0cAogICAgIAogICAgIGlmIChkb2MgJiYgZG9jLT5wYXJ0KCkgJiYgb25SZWFkeVN0YXRl Q2hhbmdlTGlzdGVuZXIpIHsKICAgICAgIGludCBpZ25vcmVFeGNlcHRpb247Ci0gICAgICBFdmVu dEltcGwgKmV2ID0gZG9jLT5jcmVhdGVFdmVudCgiSFRNTEV2ZW50cyIsIGlnbm9yZUV4Y2VwdGlv bik7Ci0gICAgICBldi0+cmVmKCk7CisgICAgICBSZWZQdHI8RXZlbnRJbXBsPiBldiA9IGRvYy0+ Y3JlYXRlRXZlbnQoIkhUTUxFdmVudHMiLCBpZ25vcmVFeGNlcHRpb24pOwogICAgICAgZXYtPmlu aXRFdmVudChyZWFkeXN0YXRlY2hhbmdlRXZlbnQsIHRydWUsIHRydWUpOwotICAgICAgb25SZWFk eVN0YXRlQ2hhbmdlTGlzdGVuZXItPmhhbmRsZUV2ZW50SW1wbChldiwgdHJ1ZSk7Ci0gICAgICBl di0+ZGVyZWYoKTsKKyAgICAgIG9uUmVhZHlTdGF0ZUNoYW5nZUxpc3RlbmVyLT5oYW5kbGVFdmVu dEltcGwoZXYuZ2V0KCksIHRydWUpOwogICAgIH0KICAgICAKICAgICBpZiAoZG9jICYmIGRvYy0+ cGFydCgpICYmIHN0YXRlID09IENvbXBsZXRlZCAmJiBvbkxvYWRMaXN0ZW5lcikgewogICAgICAg aW50IGlnbm9yZUV4Y2VwdGlvbjsKLSAgICAgIEV2ZW50SW1wbCAqZXYgPSBkb2MtPmNyZWF0ZUV2 ZW50KCJIVE1MRXZlbnRzIiwgaWdub3JlRXhjZXB0aW9uKTsKLSAgICAgIGV2LT5yZWYoKTsKKyAg ICAgIFJlZlB0cjxFdmVudEltcGw+IGV2ID0gZG9jLT5jcmVhdGVFdmVudCgiSFRNTEV2ZW50cyIs IGlnbm9yZUV4Y2VwdGlvbik7CiAgICAgICBldi0+aW5pdEV2ZW50KGxvYWRFdmVudCwgdHJ1ZSwg dHJ1ZSk7Ci0gICAgICBvbkxvYWRMaXN0ZW5lci0+aGFuZGxlRXZlbnRJbXBsKGV2LCB0cnVlKTsK LSAgICAgIGV2LT5kZXJlZigpOworICAgICAgb25Mb2FkTGlzdGVuZXItPmhhbmRsZUV2ZW50SW1w bChldi5nZXQoKSwgdHJ1ZSk7CiAgICAgfQogICB9CiB9CkBAIC0zODUsMTAgKzM3Nyw3IEBAIHZv aWQgWE1MSHR0cFJlcXVlc3Q6OmFib3J0KCkKICAgICBqb2ItPmtpbGwoKTsKICAgICBqb2IgPSAw OwogICB9Ci0gIGlmIChkZWNvZGVyKSB7Ci0gICAgZGVjb2Rlci0+ZGVyZWYoKTsKLSAgICBkZWNv ZGVyID0gMDsKLSAgfQorICBkZWNvZGVyID0gMDsKICAgYWJvcnRlZCA9IHRydWU7CiAKICAgaWYg KGhhZEpvYikgewpAQCAtNTIzLDE5ICs1MTIsMTQgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6cHJv Y2Vzc1N5bmNMb2FkUmVzdQogCiB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpzbG90RmluaXNoZWQoS0lP OjpKb2IgKikKIHsKLSAgaWYgKGRlY29kZXIpIHsKKyAgaWYgKGRlY29kZXIpCiAgICAgcmVzcG9u c2UgKz0gZGVjb2Rlci0+Zmx1c2goKTsKLSAgfQogCiAgIHJlbW92ZUZyb21SZXF1ZXN0c0J5RG9j dW1lbnQoKTsKICAgam9iID0gMDsKIAogICBjaGFuZ2VTdGF0ZShDb21wbGV0ZWQpOwotICAKLSAg aWYgKGRlY29kZXIpIHsKLSAgICBkZWNvZGVyLT5kZXJlZigpOwotICAgIGRlY29kZXIgPSAwOwot ICB9CisgIGRlY29kZXIgPSAwOwogCiAgIEpTTG9jayBsb2NrOwogICBnY1VucHJvdGVjdCh0aGlz KTsKQEAgLTU1Nyw3ICs1NDEsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpzbG90RGF0YSggS0lP OjpKb2IqCiAgIH0KICAgCiAKLSAgaWYgKCBkZWNvZGVyID09IE5VTEwgKSB7CisgIGlmICghZGVj b2RlcikgewogICAgIGRlY29kZXIgPSBuZXcgRGVjb2RlcjsKICAgICBpZiAoIWVuY29kaW5nLmlz TnVsbCgpKQogICAgICAgZGVjb2Rlci0+c2V0RW5jb2RpbmcoZW5jb2RpbmcubGF0aW4xKCksIERl Y29kZXI6OkVuY29kaW5nRnJvbUhUVFBIZWFkZXIpOwpJbmRleDogbWlzYy9kZWNvZGVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29yZS9raHRtbC9taXNjL2RlY29kZXIu Y3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQ4CmRpZmYgLXAgLXUgLXIxLjQ4IG1pc2MvZGVj b2Rlci5jcHAKLS0tIG1pc2MvZGVjb2Rlci5jcHAJMTQgRGVjIDIwMDUgMjM6MzE6NTQgLTAwMDAJ MS40OAorKysgbWlzYy9kZWNvZGVyLmNwcAkxNiBEZWMgMjAwNSAxMDoxMjoyNCAtMDAwMApAQCAt MjY5LDkgKzI2OSw3IEBAIGJyZWFrQnJlYWs6CiAKIERlY29kZXI6OkRlY29kZXIoKSAKIHsKLSAg ICBfcmVmQ291bnQgPSAxOwotICAgIC8vIGxhdGluMQotICAgIG1fY29kZWMgPSBRVGV4dENvZGVj Ojpjb2RlY0Zvck5hbWUoImlzbzg4NTktMSIpOworICAgIG1fY29kZWMgPSBRVGV4dENvZGVjOjpj b2RlY0Zvck5hbWUoImlzbzg4NTktMSIpOyAvLyBsYXRpbjEKICAgICBtX2RlY29kZXIgPSBtX2Nv ZGVjLT5tYWtlRGVjb2RlcigpOwogICAgIGVuYyA9IDA7CiAgICAgbV90eXBlID0gRGVmYXVsdEVu Y29kaW5nOwpAQCAtMjgxLDcgKzI3OSw2IEBAIERlY29kZXI6OkRlY29kZXIoKSAKIH0KIERlY29k ZXI6On5EZWNvZGVyKCkKIHsKLSAgICBhc3NlcnQoX3JlZkNvdW50ID09IDApOwogICAgIGRlbGV0 ZSBtX2RlY29kZXI7CiB9CiAKSW5kZXg6IG1pc2MvZGVjb2Rlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZp bGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL21pc2MvZGVjb2Rlci5oLHYKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjEwCmRpZmYgLXAgLXUgLXIxLjEwIG1pc2MvZGVjb2Rlci5oCi0tLSBtaXNjL2Rl Y29kZXIuaAkyMSBOb3YgMjAwNSAwMToyMDoxOSAtMDAwMAkxLjEwCisrKyBtaXNjL2RlY29kZXIu aAkxNiBEZWMgMjAwNSAxMDoxMjoyNCAtMDAwMApAQCAtMzAsNyArMzAsNyBAQCBuYW1lc3BhY2Ug a2h0bWwgewogLyoqCiAgKiBAaW50ZXJuYWwKICAqLwotY2xhc3MgRGVjb2RlcgorY2xhc3MgRGVj b2RlciA6IHB1YmxpYyBTaGFyZWQ8RGVjb2Rlcj4KIHsKIHB1YmxpYzoKICAgICBlbnVtIEVuY29k aW5nVHlwZSB7CkBAIC01Niw5ICs1Niw2IEBAIHB1YmxpYzoKIAogICAgIFFTdHJpbmcgZmx1c2go KSBjb25zdDsKIAotICAgIHZvaWQgcmVmKCkgeyArK19yZWZDb3VudDsgfQotICAgIHZvaWQgZGVy ZWYoKSB7IGlmICghLS1fcmVmQ291bnQpIGRlbGV0ZSB0aGlzOyB9Ci0KIHByb3RlY3RlZDoKICAg ICAvLyBjb2RlYyB1c2VkIGZvciBkZWNvZGluZy4gZGVmYXVsdCBpcyBMYXRpbjEuCiAgICAgUVRl eHRDb2RlYyAqbV9jb2RlYzsKQEAgLTczLDggKzcwLDYgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wg Ym9keTsKICAgICBib29sIGJlZ2lubmluZzsKICAgICBib29sIHZpc3VhbFJUTDsKLQotICAgIHVu c2lnbmVkIF9yZWZDb3VudDsKIH07CiAKIH0KSW5kZXg6IG1pc2MvbG9hZGVyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvbWlzYy9sb2FkZXIuaCx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS40OApkaWZmIC1wIC11IC1yMS40OCBtaXNjL2xvYWRlci5oCi0tLSBt aXNjL2xvYWRlci5oCTE1IERlYyAyMDA1IDIyOjMxOjQ0IC0wMDAwCTEuNDgKKysrIG1pc2MvbG9h ZGVyLmgJMTYgRGVjIDIwMDUgMTA6MTI6MjQgLTAwMDAKQEAgLTQxNCw3ICs0MTQsNyBAQCBwdWJs aWM6CiAgICAgICAgIAogcHJvdGVjdGVkOgogICAgICAgICBET006OkRPTVN0cmluZyBtX3NoZWV0 OwotICAgICAgICBEZWNvZGVyKiBtX2RlY29kZXI7CisgICAgICAgIFJlZlB0cjxEZWNvZGVyPiBt X2RlY29kZXI7CiAgICAgfTsKICNlbmRpZgogICAgIApAQCAtNDQwLDcgKzQ0MCw3IEBAIHByb3Rl Y3RlZDoKICAgICAgICAgCiBwcm90ZWN0ZWQ6CiAgICAgICAgIFhCTDo6WEJMRG9jdW1lbnRJbXBs KiBtX2RvY3VtZW50OwotICAgICAgICBEZWNvZGVyKiBtX2RlY29kZXI7CisgICAgICAgIFJlZlB0 cjxEZWNvZGVyPiBtX2RlY29kZXI7CiAgICAgfTsKICNlbmRpZgogCkluZGV4OiB4bWwvZG9tX2Rv Y2ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL3ht bC9kb21fZG9jaW1wbC5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjg1CmRpZmYgLXAgLXUg LXIxLjI4NSB4bWwvZG9tX2RvY2ltcGwuY3BwCi0tLSB4bWwvZG9tX2RvY2ltcGwuY3BwCTE1IERl YyAyMDA1IDIyOjMxOjQ5IC0wMDAwCTEuMjg1CisrKyB4bWwvZG9tX2RvY2ltcGwuY3BwCTE2IERl YyAyMDA1IDEwOjEyOjI3IC0wMDAwCkBAIC0zOTAsNyArMzkwLDYgQEAgRG9jdW1lbnRJbXBsOjpE b2N1bWVudEltcGwoRE9NSW1wbGVtZW50YQogICAgICwgbV9zYXZlZFJlbmRlcmVyKDApCiAgICAg LCBtX3Bhc3N3b3JkRmllbGRzKDApCiAgICAgLCBtX3NlY3VyZUZvcm1zKDApCi0gICAgLCBtX2Rl Y29kZXIoMCkKICAgICAsIG1fY3JlYXRlUmVuZGVyZXJzKHRydWUpCiAgICAgLCBtX2Rlc2lnbk1v ZGUoaW5oZXJpdCkKICAgICAsIG1faGFzRGFzaGJvYXJkUmVnaW9ucyhmYWxzZSkKQEAgLTU0NCwx MSArNTQzLDcgQEAgRG9jdW1lbnRJbXBsOjp+RG9jdW1lbnRJbXBsKCkKICAgICAgICAgZGVsZXRl IG1fYWNjQ2FjaGU7CiAgICAgICAgIG1fYWNjQ2FjaGUgPSAwOwogICAgIH0KLSAgICAKLSAgICBp ZiAobV9kZWNvZGVyKXsKLSAgICAgICAgbV9kZWNvZGVyLT5kZXJlZigpOwotICAgICAgICBtX2Rl Y29kZXIgPSAwOwotICAgIH0KKyAgICBtX2RlY29kZXIgPSAwOwogICAgIAogICAgIGlmIChtX2pz RWRpdG9yKSB7CiAgICAgICAgIGRlbGV0ZSBtX2pzRWRpdG9yOwpAQCAtMjc0OCwxMCArMjc0Myw2 IEBAIEhUTUxNYXBFbGVtZW50SW1wbCAqRG9jdW1lbnRJbXBsOjpnZXRJbWEKIAogdm9pZCBEb2N1 bWVudEltcGw6OnNldERlY29kZXIoRGVjb2RlciAqZGVjb2RlcikKIHsKLSAgICBkZWNvZGVyLT5y ZWYoKTsKLSAgICBpZiAobV9kZWNvZGVyKSB7Ci0gICAgICAgIG1fZGVjb2Rlci0+ZGVyZWYoKTsK LSAgICB9CiAgICAgbV9kZWNvZGVyID0gZGVjb2RlcjsKIH0KIApJbmRleDogeG1sL2RvbV9kb2Np bXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwveG1sL2Rv bV9kb2NpbXBsLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTQzCmRpZmYgLXAgLXUgLXIxLjE0 MyB4bWwvZG9tX2RvY2ltcGwuaAotLS0geG1sL2RvbV9kb2NpbXBsLmgJMSBEZWMgMjAwNSAxMDoz MjoyNiAtMDAwMAkxLjE0MworKysgeG1sL2RvbV9kb2NpbXBsLmgJMTYgRGVjIDIwMDUgMTA6MTI6 MjggLTAwMDAKQEAgLTc0NSw3ICs3NDUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzaG91bGRDcmVh dGVSZW5kZXJlcnMoKTsKICAgICAKICAgICB2b2lkIHNldERlY29kZXIoa2h0bWw6OkRlY29kZXIg Kik7Ci0gICAga2h0bWw6OkRlY29kZXIgKmRlY29kZXIoKSBjb25zdCB7IHJldHVybiBtX2RlY29k ZXI7IH0KKyAgICBraHRtbDo6RGVjb2RlciAqZGVjb2RlcigpIGNvbnN0IHsgcmV0dXJuIG1fZGVj b2Rlci5nZXQoKTsgfQogCiAgICAgdm9pZCBzZXREYXNoYm9hcmRSZWdpb25zRGlydHkoYm9vbCBm KSB7IG1fZGFzaGJvYXJkUmVnaW9uc0RpcnR5ID0gZjsgfQogICAgIGJvb2wgZGFzaGJvYXJkUmVn aW9uc0RpcnR5KCkgY29uc3QgeyByZXR1cm4gbV9kYXNoYm9hcmRSZWdpb25zRGlydHk7IH0KQEAg LTc3OSw3ICs3NzksNyBAQCBwcml2YXRlOgogICAgIGludCBtX3Bhc3N3b3JkRmllbGRzOwogICAg IGludCBtX3NlY3VyZUZvcm1zOwogICAgIAotICAgIGtodG1sOjpEZWNvZGVyICptX2RlY29kZXI7 CisgICAgUmVmUHRyPGtodG1sOjpEZWNvZGVyPiBtX2RlY29kZXI7CiAKICAgICBtdXRhYmxlIFFE aWN0PEVsZW1lbnRJbXBsPiBtX2VsZW1lbnRzQnlJZDsKICAgICBtdXRhYmxlIFFEaWN0PGNoYXI+ IG1faWRDb3VudDsK