109743 2013-02-13 13:24:47 -0800 Remove support for the DispatchOnConnectionQueue message attribute 2013-02-13 13:29:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 832262 0 andersca 2013-02-13 13:24:47 -0800 Remove support for the DispatchOnConnectionQueue message attribute 832265 1 188165 andersca 2013-02-13 13:26:16 -0800 Created attachment 188165 Patch 832274 2 andersca 2013-02-13 13:29:39 -0800 Committed r142783: <http://trac.webkit.org/changeset/142783> 188165 2013-02-13 13:26:16 -0800 2013-02-13 13:28:31 -0800 Patch bug-109743-20130213132245.patch text/plain 9686 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWIzMjFkZmE2NDk2ZmNj OGQ4ZWY2MTA0MjQwYzg1OTNlMDcwYWY0MS4uYmNmMjQzZWFlM2VjNjNkNTVlYTIyOTA5NjA4M2I0 ZWVmNzVkNmJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEzLTAyLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHN1cHBv cnQgZm9yIHRoZSBEaXNwYXRjaE9uQ29ubmVjdGlvblF1ZXVlIG1lc3NhZ2UgYXR0cmlidXRlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk3NDMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3Jt L0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oOgorICAgICAgICAoQ29yZUlQQyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5OgorICAgICAgICAoaGFuZGxlcl9mdW5jdGlvbik6 CisgICAgICAgIChnZW5lcmF0ZV9tZXNzYWdlX2hhbmRsZXIpOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0Mi9tZXNzYWdlc191bml0dGVzdC5weToKKworMjAxMy0wMi0xMyAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFN0b3JhZ2VNYW5hZ2VyIHNob3Vs ZCBiZSBhIFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NzQxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgKaW5kZXggODM0OGRlNmIyMmQ3NjQyYjkzMjgw ODBjNjRmYWZlZjM5YTNkMTRiYS4uZGYwYWE2ZjY5MDYyNDFiYjE0ZjczMDEwZDI2NDcxYTMyOTJl MzEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVN ZXNzYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNz YWdlLmgKQEAgLTM1MCwxNSArMzUwLDYgQEAgdm9pZCBoYW5kbGVNZXNzYWdlKENvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIE1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBDKiBvYmplY3QsIE0KIH0KIAog dGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgQywgdHlwZW5hbWUgTUY+Ci12b2lkIGhhbmRs ZU1lc3NhZ2VPbkNvbm5lY3Rpb25RdWV1ZShDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBNZXNzYWdl RGVjb2RlciYgZGVjb2RlciwgQyogb2JqZWN0LCBNRiBmdW5jdGlvbikKLXsKLSAgICB0eXBlbmFt ZSBUOjpEZWNvZGVUeXBlOjpWYWx1ZVR5cGUgYXJndW1lbnRzOwotICAgIGlmICghZGVjb2Rlci5k ZWNvZGUoYXJndW1lbnRzKSkKLSAgICAgICAgcmV0dXJuOwotICAgIGNhbGxNZW1iZXJGdW5jdGlv bihjb25uZWN0aW9uLCBhcmd1bWVudHMsIG9iamVjdCwgZnVuY3Rpb24pOwotfQotCi10ZW1wbGF0 ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBDLCB0eXBlbmFtZSBNRj4KIHZvaWQgaGFuZGxlTWVzc2Fn ZVZhcmlhZGljKE1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBDKiBvYmplY3QsIE1GIGZ1bmN0aW9u KQogewogICAgIHR5cGVuYW1lIFQ6OkRlY29kZVR5cGU6OlZhbHVlVHlwZSBhcmd1bWVudHM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkgYi9T b3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKaW5kZXggNDkyOTNkMmUw MGZiODk5MTE2OTI2NDQ1MmNmOGM5YzE0N2UzYjNmNi4uNWU5OWY1MDBjMWFmZDQ3NDViYzFmZGVh ZDlkMmViYzQ4ODYzY2U0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJr aXQyL21lc3NhZ2VzLnB5CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNz YWdlcy5weQpAQCAtMjcsNyArMjcsNiBAQCBmcm9tIHdlYmtpdDIgaW1wb3J0IHBhcnNlcgogV0FO VFNfQ09OTkVDVElPTl9BVFRSSUJVVEUgPSAnV2FudHNDb25uZWN0aW9uJwogTEVHQUNZX1JFQ0VJ VkVSX0FUVFJJQlVURSA9ICdMZWdhY3lSZWNlaXZlcicKIERFTEFZRURfQVRUUklCVVRFID0gJ0Rl bGF5ZWQnCi1ESVNQQVRDSF9PTl9DT05ORUNUSU9OX1FVRVVFX0FUVFJJQlVURSA9ICdEaXNwYXRj aE9uQ29ubmVjdGlvblF1ZXVlJwogVkFSSUFESUNfQVRUUklCVVRFID0gJ1ZhcmlhZGljJwogCiBf bGljZW5zZV9oZWFkZXIgPSAiIiIvKgpAQCAtMzA0LDE2ICszMDMsNiBAQCBkZWYgaGFuZGxlcl9m dW5jdGlvbihyZWNlaXZlciwgbWVzc2FnZSk6CiAgICAgcmV0dXJuICclczo6JXMnICUgKHJlY2Vp dmVyLm5hbWUsIG1lc3NhZ2UubmFtZVswXS5sb3dlcigpICsgbWVzc2FnZS5uYW1lWzE6XSkKIAog Ci1kZWYgY29ubmVjdGlvbl93b3JrX3F1ZXVlX21lc3NhZ2Vfc3RhdGVtZW50KHJlY2VpdmVyLCBt ZXNzYWdlKToKLSAgICBkaXNwYXRjaF9mdW5jdGlvbl9hcmdzID0gWydjb25uZWN0aW9uJywgJypk ZWNvZGVyJywgJ3RoaXMnLCAnJiVzJyAlIGhhbmRsZXJfZnVuY3Rpb24ocmVjZWl2ZXIsIG1lc3Nh Z2UpXQotICAgIHJlc3VsdCA9IFtdCi0gICAgcmVzdWx0LmFwcGVuZCgnICAgIGlmIChkZWNvZGVy LT5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjolczo6JXM6Om5hbWUoKSkge1xuJyAlIChyZWNl aXZlci5uYW1lLCBtZXNzYWdlLm5hbWUpKQotICAgIHJlc3VsdC5hcHBlbmQoJyAgICAgICAgQ29y ZUlQQzo6aGFuZGxlTWVzc2FnZU9uQ29ubmVjdGlvblF1ZXVlPE1lc3NhZ2VzOjolczo6JXM+KCVz KTtcbicgJSAocmVjZWl2ZXIubmFtZSwgbWVzc2FnZS5uYW1lLCAnLCAnLmpvaW4oZGlzcGF0Y2hf ZnVuY3Rpb25fYXJncykpKQotICAgIHJlc3VsdC5hcHBlbmQoJyAgICAgICAgZGVjb2RlciA9IG51 bGxwdHI7XG4nKQotICAgIHJlc3VsdC5hcHBlbmQoJyAgICAgICAgcmV0dXJuO1xuJykKLSAgICBy ZXN1bHQuYXBwZW5kKCcgICAgfVxuJykKLSAgICByZXR1cm4gc3Vycm91bmRfaW5fY29uZGl0aW9u KCcnLmpvaW4ocmVzdWx0KSwgbWVzc2FnZS5jb25kaXRpb24pCi0KIGRlZiBhc3luY19tZXNzYWdl X3N0YXRlbWVudChyZWNlaXZlciwgbWVzc2FnZSk6CiAgICAgZGlzcGF0Y2hfZnVuY3Rpb25fYXJn cyA9IFsnZGVjb2RlcicsICd0aGlzJywgJyYlcycgJSBoYW5kbGVyX2Z1bmN0aW9uKHJlY2VpdmVy LCBtZXNzYWdlKV0KIApAQCAtNTI0LDM0ICs1MTMsMTMgQEAgZGVmIGdlbmVyYXRlX21lc3NhZ2Vf aGFuZGxlcihmaWxlKToKIAogICAgIHJlc3VsdC5hcHBlbmQoJ25hbWVzcGFjZSBXZWJLaXQge1xu XG4nKQogCi0gICAgYXN5bmNfZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZV9tZXNzYWdlcyA9 IFtdCi0gICAgc3luY19kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVlX21lc3NhZ2VzID0gW10K ICAgICBhc3luY19tZXNzYWdlcyA9IFtdCiAgICAgc3luY19tZXNzYWdlcyA9IFtdCiAgICAgZm9y IG1lc3NhZ2UgaW4gcmVjZWl2ZXIubWVzc2FnZXM6CiAgICAgICAgIGlmIG1lc3NhZ2UucmVwbHlf cGFyYW1ldGVycyBpcyBub3QgTm9uZToKLSAgICAgICAgICAgIGlmIG1lc3NhZ2UuaGFzX2F0dHJp YnV0ZShESVNQQVRDSF9PTl9DT05ORUNUSU9OX1FVRVVFX0FUVFJJQlVURSk6Ci0gICAgICAgICAg ICAgICAgc3luY19kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVlX21lc3NhZ2VzLmFwcGVuZCht ZXNzYWdlKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBzeW5jX21lc3NhZ2Vz LmFwcGVuZChtZXNzYWdlKQorICAgICAgICAgICAgc3luY19tZXNzYWdlcy5hcHBlbmQobWVzc2Fn ZSkKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGlmIG1lc3NhZ2UuaGFzX2F0dHJpYnV0ZShE SVNQQVRDSF9PTl9DT05ORUNUSU9OX1FVRVVFX0FUVFJJQlVURSk6Ci0gICAgICAgICAgICAgICAg YXN5bmNfZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZV9tZXNzYWdlcy5hcHBlbmQobWVzc2Fn ZSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgYXN5bmNfbWVzc2FnZXMuYXBw ZW5kKG1lc3NhZ2UpCi0KLSAgICBpZiBhc3luY19kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVl X21lc3NhZ2VzOgotICAgICAgICByZXN1bHQuYXBwZW5kKCd2b2lkICVzOjpkaWRSZWNlaXZlJXNN ZXNzYWdlT25Db25uZWN0aW9uV29ya1F1ZXVlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rp b24sIE93blB0cjxDb3JlSVBDOjpNZXNzYWdlRGVjb2Rlcj4mIGRlY29kZXIpXG4nICUgKHJlY2Vp dmVyLm5hbWUsIHJlY2VpdmVyLm5hbWUpKQotICAgICAgICByZXN1bHQuYXBwZW5kKCd7XG4nKQot ICAgICAgICByZXN1bHQuYXBwZW5kKCcjaWYgQ09NUElMRVIoTVNWQylcbicpCi0gICAgICAgIHJl c3VsdC5hcHBlbmQoJyNwcmFnbWEgd2FybmluZyhwdXNoKVxuJykKLSAgICAgICAgcmVzdWx0LmFw cGVuZCgnI3ByYWdtYSB3YXJuaW5nKGRpc2FibGU6IDQwNjUpXG4nKQotICAgICAgICByZXN1bHQu YXBwZW5kKCcjZW5kaWZcbicpCi0gICAgICAgIHJlc3VsdCArPSBbY29ubmVjdGlvbl93b3JrX3F1 ZXVlX21lc3NhZ2Vfc3RhdGVtZW50KHJlY2VpdmVyLCBtZXNzYWdlKSBmb3IgbWVzc2FnZSBpbiBh c3luY19kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVlX21lc3NhZ2VzXQotICAgICAgICByZXN1 bHQuYXBwZW5kKCcjaWYgQ09NUElMRVIoTVNWQylcbicpCi0gICAgICAgIHJlc3VsdC5hcHBlbmQo JyNwcmFnbWEgd2FybmluZyhwb3ApXG4nKQotICAgICAgICByZXN1bHQuYXBwZW5kKCcjZW5kaWZc bicpCi0gICAgICAgIHJlc3VsdC5hcHBlbmQoJ31cblxuJykKKyAgICAgICAgICAgIGFzeW5jX21l c3NhZ2VzLmFwcGVuZChtZXNzYWdlKQogCiAgICAgaWYgYXN5bmNfbWVzc2FnZXM6CiAgICAgICAg IGlmIHJlY2VpdmVyLmhhc19hdHRyaWJ1dGUoTEVHQUNZX1JFQ0VJVkVSX0FUVFJJQlVURSk6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRl c3QucHkgYi9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRlc3Qu cHkKaW5kZXggNGYwODcxOTg4ZWI2NzMwMTY2ZmIzMjRkZGZmM2IzN2NhOTc5ZDBmOC4uOGYyYTZj M2EwNzQ5Zjg2NzU4OGVjMWRjYTdiZDY3NmJiYWQ0NzgxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzX3VuaXR0ZXN0LnB5CisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191bml0dGVzdC5weQpAQCAtNjYsMTEgKzY2 LDEwIEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogCiAgICAgQ3JlYXRl UGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQsIFdlYktpdDo6UGx1Z2luOjpQYXJhbWV0 ZXJzIHBhcmFtZXRlcnMpIC0+IChib29sIHJlc3VsdCkKICAgICBSdW5KYXZhU2NyaXB0QWxlcnQo dWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcgbWVzc2FnZSkgLT4gKCkKLSAgICBHZXRQbHVn aW5zKGJvb2wgcmVmcmVzaCkgLT4gKFZlY3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiBwbHVnaW5z KSBEaXNwYXRjaE9uQ29ubmVjdGlvblF1ZXVlCisgICAgR2V0UGx1Z2lucyhib29sIHJlZnJlc2gp IC0+IChWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4gcGx1Z2lucykKICAgICBHZXRQbHVnaW5Q cm9jZXNzQ29ubmVjdGlvbihXVEY6OlN0cmluZyBwbHVnaW5QYXRoKSAtPiAoQ29yZUlQQzo6Q29u bmVjdGlvbjo6SGFuZGxlIGNvbm5lY3Rpb25IYW5kbGUpIERlbGF5ZWQKIAotICAgIFRlc3RNdWx0 aXBsZUF0dHJpYnV0ZXMoKSAtPiAoKSBEaXNwYXRjaE9uQ29ubmVjdGlvblF1ZXVlIERlbGF5ZWQK LSAgICBUZXN0Q29ubmVjdGlvblF1ZXVlKHVpbnQ2NF90IHBsdWdpbklEKSBEaXNwYXRjaE9uQ29u bmVjdGlvblF1ZXVlCisgICAgVGVzdE11bHRpcGxlQXR0cmlidXRlcygpIC0+ICgpIFdhbnRzQ29u bmVjdGlvbiBEZWxheWVkCiAKICAgICBUZXN0UGFyYW1ldGVyQXR0cmlidXRlcyhbQXR0cmlidXRl T25lIEF0dHJpYnV0ZVR3b10gdWludDY0X3QgZm9vLCBkb3VibGUgYmFyLCBbQXR0cmlidXRlVGhy ZWVdIGRvdWJsZSBiYXopCiAKQEAgLTE5OSwxMyArMTk4LDYgQEAgX2V4cGVjdGVkX3Jlc3VsdHMg PSB7CiAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IChOb25lKSwKICAgICAgICAgfSwKICAgICAg ICAgewotICAgICAgICAgICAgJ25hbWUnOiAnVGVzdENvbm5lY3Rpb25RdWV1ZScsCi0gICAgICAg ICAgICAncGFyYW1ldGVycyc6ICgKLSAgICAgICAgICAgICAgICAoJ3VpbnQ2NF90JywgJ3BsdWdp bklEJyksCi0gICAgICAgICAgICApLAotICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiAoTm9uZSks Ci0gICAgICAgIH0sCi0gICAgICAgIHsKICAgICAgICAgICAgICduYW1lJzogJ1Rlc3RQYXJhbWV0 ZXJBdHRyaWJ1dGVzJywKICAgICAgICAgICAgICdwYXJhbWV0ZXJzJzogKAogICAgICAgICAgICAg ICAgICgndWludDY0X3QnLCAnZm9vJywgKCdBdHRyaWJ1dGVPbmUnLCAnQXR0cmlidXRlVHdvJykp LApAQCAtNTExLDE4ICs1MDMsNiBAQCBzdHJ1Y3QgVGVzdE11bHRpcGxlQXR0cmlidXRlcyA6IENv cmVJUEM6OkFyZ3VtZW50czAgewogICAgIHR5cGVkZWYgQ29yZUlQQzo6QXJndW1lbnRzMCBEZWNv ZGVUeXBlOwogfTsKIAotc3RydWN0IFRlc3RDb25uZWN0aW9uUXVldWUgOiBDb3JlSVBDOjpBcmd1 bWVudHMxPHVpbnQ2NF90PiB7Ci0gICAgc3RhdGljIENvcmVJUEM6OlN0cmluZ1JlZmVyZW5jZSBy ZWNlaXZlck5hbWUoKSB7IHJldHVybiBtZXNzYWdlUmVjZWl2ZXJOYW1lKCk7IH0KLSAgICBzdGF0 aWMgQ29yZUlQQzo6U3RyaW5nUmVmZXJlbmNlIG5hbWUoKSB7IHJldHVybiBDb3JlSVBDOjpTdHJp bmdSZWZlcmVuY2UoIlRlc3RDb25uZWN0aW9uUXVldWUiKTsgfQotICAgIHN0YXRpYyBjb25zdCBi b29sIGlzU3luYyA9IGZhbHNlOwotCi0gICAgdHlwZWRlZiBDb3JlSVBDOjpBcmd1bWVudHMxPHVp bnQ2NF90PiBEZWNvZGVUeXBlOwotICAgIGV4cGxpY2l0IFRlc3RDb25uZWN0aW9uUXVldWUodWlu dDY0X3QgcGx1Z2luSUQpCi0gICAgICAgIDogQ29yZUlQQzo6QXJndW1lbnRzMTx1aW50NjRfdD4o cGx1Z2luSUQpCi0gICAgewotICAgIH0KLX07Ci0KIHN0cnVjdCBUZXN0UGFyYW1ldGVyQXR0cmli dXRlcyA6IENvcmVJUEM6OkFyZ3VtZW50czM8dWludDY0X3QsIGRvdWJsZSwgZG91YmxlPiB7CiAg ICAgc3RhdGljIENvcmVJUEM6OlN0cmluZ1JlZmVyZW5jZSByZWNlaXZlck5hbWUoKSB7IHJldHVy biBtZXNzYWdlUmVjZWl2ZXJOYW1lKCk7IH0KICAgICBzdGF0aWMgQ29yZUlQQzo6U3RyaW5nUmVm ZXJlbmNlIG5hbWUoKSB7IHJldHVybiBDb3JlSVBDOjpTdHJpbmdSZWZlcmVuY2UoIlRlc3RQYXJh bWV0ZXJBdHRyaWJ1dGVzIik7IH0KQEAgLTcwMywyMiArNjgzLDYgQEAgYm9vbCBUZXN0TXVsdGlw bGVBdHRyaWJ1dGVzOjpEZWxheWVkUmVwbHk6OnNlbmQoKQogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAotdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlV2ViUGFnZU1lc3NhZ2VPbkNvbm5lY3Rpb25Xb3Jr UXVldWUoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgT3duUHRyPENvcmVJUEM6Ok1l c3NhZ2VEZWNvZGVyPiYgZGVjb2RlcikKLXsKLSNpZiBDT01QSUxFUihNU1ZDKQotI3ByYWdtYSB3 YXJuaW5nKHB1c2gpCi0jcHJhZ21hIHdhcm5pbmcoZGlzYWJsZTogNDA2NSkKLSNlbmRpZgotICAg IGlmIChkZWNvZGVyLT5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlOjpUZXN0Q29u bmVjdGlvblF1ZXVlOjpuYW1lKCkpIHsKLSAgICAgICAgQ29yZUlQQzo6aGFuZGxlTWVzc2FnZU9u Q29ubmVjdGlvblF1ZXVlPE1lc3NhZ2VzOjpXZWJQYWdlOjpUZXN0Q29ubmVjdGlvblF1ZXVlPihj b25uZWN0aW9uLCAqZGVjb2RlciwgdGhpcywgJldlYlBhZ2U6OnRlc3RDb25uZWN0aW9uUXVldWUp OwotICAgICAgICBkZWNvZGVyID0gbnVsbHB0cjsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSNp ZiBDT01QSUxFUihNU1ZDKQotI3ByYWdtYSB3YXJuaW5nKHBvcCkKLSNlbmRpZgotfQotCiB2b2lk IFdlYlBhZ2U6OmRpZFJlY2VpdmVXZWJQYWdlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwg Q29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7CiAgICAgaWYgKGRlY29kZXIubWVz c2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFVSTDo6bmFtZSgpKSB7CkBAIC03 ODYsMTAgKzc1MCwxOCBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVTeW5jV2ViUGFnZU1lc3Nh Z2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZQogICAgICAgICBDb3JlSVBD OjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlOjpSdW5KYXZhU2NyaXB0QWxlcnQ+KGRl Y29kZXIsICpyZXBseUVuY29kZXIsIHRoaXMsICZXZWJQYWdlOjpydW5KYXZhU2NyaXB0QWxlcnQp OwogICAgICAgICByZXR1cm47CiAgICAgfQorICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBsdWdpbnM6Om5hbWUoKSkgeworICAgICAgICBDb3Jl SVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQbHVnaW5zPihkZWNvZGVy LCAqcmVwbHlFbmNvZGVyLCB0aGlzLCAmV2ViUGFnZTo6Z2V0UGx1Z2lucyk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CiAgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZTo6R2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb246Om5hbWUoKSkgewogICAgICAgICBD b3JlSVBDOjpoYW5kbGVNZXNzYWdlRGVsYXllZDxNZXNzYWdlczo6V2ViUGFnZTo6R2V0UGx1Z2lu UHJvY2Vzc0Nvbm5lY3Rpb24+KGNvbm5lY3Rpb24sIGRlY29kZXIsIHJlcGx5RW5jb2RlciwgdGhp cywgJldlYlBhZ2U6OmdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQ YWdlOjpUZXN0TXVsdGlwbGVBdHRyaWJ1dGVzOjpuYW1lKCkpIHsKKyAgICAgICAgQ29yZUlQQzo6 aGFuZGxlTWVzc2FnZURlbGF5ZWQ8TWVzc2FnZXM6OldlYlBhZ2U6OlRlc3RNdWx0aXBsZUF0dHJp YnV0ZXM+KGNvbm5lY3Rpb24sIGRlY29kZXIsIHJlcGx5RW5jb2RlciwgdGhpcywgJldlYlBhZ2U6 OnRlc3RNdWx0aXBsZUF0dHJpYnV0ZXMpOworICAgICAgICByZXR1cm47CisgICAgfQogI2lmIFBM QVRGT1JNKE1BQykKICAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlOjpJbnRlcnByZXRLZXlFdmVudDo6bmFtZSgpKSB7CiAgICAgICAgIENvcmVJUEM6Omhh bmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2U6OkludGVycHJldEtleUV2ZW50PihkZWNvZGVy LCAqcmVwbHlFbmNvZGVyLCB0aGlzLCAmV2ViUGFnZTo6aW50ZXJwcmV0S2V5RXZlbnQpOwo=