127317 2014-01-20 15:38:26 -0800 UserContentController should keep track of user scripts 2014-01-20 16:04:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 970048 0 andersca 2014-01-20 15:38:26 -0800 UserContentController should keep track of user scripts 970049 1 221700 andersca 2014-01-20 15:39:07 -0800 Created attachment 221700 Patch 970052 2 221700 kling 2014-01-20 15:53:06 -0800 Comment on attachment 221700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221700&action=review > Source/WebCore/page/UserContentController.cpp:79 > + auto scripts = it->value.get(); Could this be a reference instead? 970053 3 221700 kling 2014-01-20 15:53:44 -0800 Comment on attachment 221700 Patch Actually no. This is crashy on EWS :| 970057 4 221701 andersca 2014-01-20 15:57:49 -0800 Created attachment 221701 Patch 970062 5 andersca 2014-01-20 16:04:35 -0800 Committed r162384: <http://trac.webkit.org/changeset/162384> 221700 2014-01-20 15:39:07 -0800 2014-01-20 15:57:48 -0800 Patch bug-127317-20140120153906.patch text/plain 10464 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIzM2QwNzczYzA3OWI3 YTliMjA5ZjFmNzIzZmRjN2YxY2I1YzAzYS4uMjlkNDVmZWFlNzkyMjU0OThmNzBmMTg2ZGQ2ODhk Y2JkNjU2ODkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw3ICsxLDM0IEBACiAyMDE0LTAxLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlckNvbnRlbnRD b250cm9sbGVyIHNob3VsZCBrZWVwIHRyYWNrIG9mIHVzZXIgc2NyaXB0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MzE3CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xNTg2MTI5Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb3ZlIGhhbmRsaW5nIG9mIHVzZXIgc2NyaXB0cyBmcm9tIFBhZ2VHcm91 cCB0byBVc2VyQ29udGVudENvbnRyb2xsZXIuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjppbmplY3RVc2VyU2NyaXB0cyk6CisgICAgICAgICog cGFnZS9QYWdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjphZGRVc2Vy U2NyaXB0VG9Xb3JsZCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OnJlbW92ZVVzZXJT Y3JpcHRGcm9tV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjpyZW1vdmVVc2Vy U2NyaXB0c0Zyb21Xb3JsZCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OnJlbW92ZUFs bFVzZXJDb250ZW50KToKKyAgICAgICAgKiBwYWdlL1BhZ2VHcm91cC5oOgorICAgICAgICAqIHBh Z2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250 ZW50Q29udHJvbGxlcjo6YWRkVXNlclNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29u dGVudENvbnRyb2xsZXI6OnJlbW92ZVVzZXJTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VXNl ckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVVc2VyU2NyaXB0cyk6CisgICAgICAgIChXZWJDb3Jl OjpVc2VyQ29udGVudENvbnRyb2xsZXI6OnJlbW92ZUFsbFVzZXJDb250ZW50KToKKyAgICAgICAg KiBwYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6VXNlckNv bnRlbnRDb250cm9sbGVyOjp1c2VyU2NyaXB0cyk6CisKKzIwMTQtMDEtMjAgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBHaXZlIGVhY2ggcGFnZSBhIFVz ZXJDb250ZW50Q29udHJvbGxlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzE1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTg2MTI5Nj4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmlu ZGV4IDRmYmQzN2YxODdiYWU1YWFhZjA1ODY0OTllNjM5YzkwM2M1MWRjMTcuLjZmNmNiOTRiNThm NzMyZjljMmE5ZWI0NjRiZDM0ZmYyMzM1NzQ1OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC05 Miw2ICs5Miw3IEBACiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiVGV4dE5v ZGVUcmF2ZXJzYWwuaCIKICNpbmNsdWRlICJUZXh0UmVzb3VyY2VEZWNvZGVyLmgiCisjaW5jbHVk ZSAiVXNlckNvbnRlbnRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiVXNlckNvbnRlbnRVUkxQYXR0 ZXJuLmgiCiAjaW5jbHVkZSAiVXNlclR5cGluZ0dlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRl ICJWaXNpYmxlVW5pdHMuaCIKQEAgLTcwMywxMyArNzA0LDE3IEBAIHZvaWQgRnJhbWU6OmluamVj dFVzZXJTY3JpcHRzKFVzZXJTY3JpcHRJbmplY3Rpb25UaW1lIGluamVjdGlvblRpbWUpCiAgICAg aWYgKGxvYWRlcigpLnN0YXRlTWFjaGluZSgpLT5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50 KCkgJiYgIXNldHRpbmdzKCkuc2hvdWxkSW5qZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURv Y3VtZW50KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIFVzZXJDb250ZW50Q29udHJvbGxlciog dXNlckNvbnRlbnRDb250cm9sbGVyID0gbV9wYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsK KyAgICBpZiAoIXVzZXJDb250ZW50Q29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCiAgICAg Ly8gV2FsayB0aGUgaGFzaHRhYmxlLiBJbmplY3QgYnkgd29ybGQuCi0gICAgY29uc3QgVXNlclNj cmlwdE1hcCogdXNlclNjcmlwdHMgPSBtX3BhZ2UtPmdyb3VwKCkudXNlclNjcmlwdHMoKTsKKyAg ICBjb25zdCBVc2VyU2NyaXB0TWFwKiB1c2VyU2NyaXB0cyA9IHVzZXJDb250ZW50Q29udHJvbGxl ci0+dXNlclNjcmlwdHMoKTsKICAgICBpZiAoIXVzZXJTY3JpcHRzKQogICAgICAgICByZXR1cm47 CiAKLSAgICBmb3IgKGF1dG8gaXQgPSB1c2VyU2NyaXB0cy0+YmVnaW4oKSwgZW5kID0gdXNlclNj cmlwdHMtPmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGluamVjdFVzZXJTY3JpcHRz Rm9yV29ybGQoKml0LT5rZXkuZ2V0KCksICppdC0+dmFsdWUsIGluamVjdGlvblRpbWUpOworICAg IGZvciAoY29uc3QgYXV0byYgd29ybGRBbmRVc2VyU2NyaXB0IDogKnVzZXJTY3JpcHRzKQorICAg ICAgICBpbmplY3RVc2VyU2NyaXB0c0ZvcldvcmxkKCp3b3JsZEFuZFVzZXJTY3JpcHQua2V5LCAq d29ybGRBbmRVc2VyU2NyaXB0LnZhbHVlLCBpbmplY3Rpb25UaW1lKTsKIH0KIAogdm9pZCBGcmFt ZTo6aW5qZWN0VXNlclNjcmlwdHNGb3JXb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBjb25z dCBVc2VyU2NyaXB0VmVjdG9yJiB1c2VyU2NyaXB0cywgVXNlclNjcmlwdEluamVjdGlvblRpbWUg aW5qZWN0aW9uVGltZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3Vw LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcAppbmRleCBiN2ZjZDIyMmJh YzQ4M2E0NTQwMWM4YjUwZDg3MGNkZjViMmNiNGYyLi4wYWQ4NmYxMDMxMWVlNjdiMzNlYTZhOGFh ZTc3YTM5ZWQzMjI3NjliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91 cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCkBAIC0yNzksMTIg KzI3OSw3IEBAIFN0b3JhZ2VOYW1lc3BhY2UqIFBhZ2VHcm91cDo6dHJhbnNpZW50TG9jYWxTdG9y YWdlKFNlY3VyaXR5T3JpZ2luKiB0b3BPcmlnaW4pCiB2b2lkIFBhZ2VHcm91cDo6YWRkVXNlclNj cmlwdFRvV29ybGQoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCwgY29uc3QgU3RyaW5nJiBzb3VyY2Us IGNvbnN0IFVSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgd2hpdGVsaXN0LCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgYmxhY2tsaXN0LCBVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSBpbmplY3Rp b25UaW1lLCBVc2VyQ29udGVudEluamVjdGVkRnJhbWVzIGluamVjdGVkRnJhbWVzKQogewogICAg IGF1dG8gdXNlclNjcmlwdCA9IHN0ZDo6bWFrZV91bmlxdWU8VXNlclNjcmlwdD4oc291cmNlLCB1 cmwsIHdoaXRlbGlzdCwgYmxhY2tsaXN0LCBpbmplY3Rpb25UaW1lLCBpbmplY3RlZEZyYW1lcyk7 Ci0gICAgaWYgKCFtX3VzZXJTY3JpcHRzKQotICAgICAgICBtX3VzZXJTY3JpcHRzID0gc3RkOjpt YWtlX3VuaXF1ZTxVc2VyU2NyaXB0TWFwPigpOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxVc2VyU2Ny aXB0VmVjdG9yPiYgc2NyaXB0c0luV29ybGQgPSBtX3VzZXJTY3JpcHRzLT5hZGQoJndvcmxkLCBu dWxscHRyKS5pdGVyYXRvci0+dmFsdWU7Ci0gICAgaWYgKCFzY3JpcHRzSW5Xb3JsZCkKLSAgICAg ICAgc2NyaXB0c0luV29ybGQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTY3JpcHRWZWN0b3I+KCk7 Ci0gICAgc2NyaXB0c0luV29ybGQtPmFwcGVuZChzdGQ6Om1vdmUodXNlclNjcmlwdCkpOworICAg IG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5hZGRVc2VyU2NyaXB0KHdvcmxkLCBzdGQ6Om1vdmUo dXNlclNjcmlwdCkpOwogfQogCiB2b2lkIFBhZ2VHcm91cDo6YWRkVXNlclN0eWxlU2hlZXRUb1dv cmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBV UkwmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHdoaXRlbGlzdCwgY29uc3QgVmVjdG9yPFN0 cmluZz4mIGJsYWNrbGlzdCwgVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1l cywgVXNlclN0eWxlTGV2ZWwgbGV2ZWwsIFVzZXJTdHlsZUluamVjdGlvblRpbWUgaW5qZWN0aW9u VGltZSkKQEAgLTMwMywyMSArMjk4LDcgQEAgdm9pZCBQYWdlR3JvdXA6OmFkZFVzZXJTdHlsZVNo ZWV0VG9Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBjb25zdCBTdHJpbmcmIHMKIAogdm9p ZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTY3JpcHRGcm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiB3 b3JsZCwgY29uc3QgVVJMJiB1cmwpCiB7Ci0gICAgaWYgKCFtX3VzZXJTY3JpcHRzKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBhdXRvIGl0ID0gbV91c2VyU2NyaXB0cy0+ZmluZCgmd29ybGQpOwot ICAgIGlmIChpdCA9PSBtX3VzZXJTY3JpcHRzLT5lbmQoKSkKLSAgICAgICAgcmV0dXJuOwotICAg IAotICAgIGF1dG8gc2NyaXB0cyA9IGl0LT52YWx1ZS5nZXQoKTsKLSAgICBmb3IgKGludCBpID0g c2NyaXB0cy0+c2l6ZSgpIC0gMTsgaSA+PSAwOyAtLWkpIHsKLSAgICAgICAgaWYgKHNjcmlwdHMt PmF0KGkpLT51cmwoKSA9PSB1cmwpCi0gICAgICAgICAgICBzY3JpcHRzLT5yZW1vdmUoaSk7Ci0g ICAgfQotICAgIAotICAgIGlmIChzY3JpcHRzLT5pc0VtcHR5KCkpCi0gICAgICAgIG1fdXNlclNj cmlwdHMtPnJlbW92ZShpdCk7CisgICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPnJlbW92ZVVz ZXJTY3JpcHQod29ybGQsIHVybCk7CiB9CiAKIHZvaWQgUGFnZUdyb3VwOjpyZW1vdmVVc2VyU3R5 bGVTaGVldEZyb21Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBjb25zdCBVUkwmIHVybCkK QEAgLTM0OSwxMCArMzMwLDcgQEAgdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTdHlsZVNoZWV0 RnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVSTCYKIAogdm9pZCBQYWdl R3JvdXA6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQp CiB7Ci0gICAgaWYgKCFtX3VzZXJTY3JpcHRzKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX3Vz ZXJTY3JpcHRzLT5yZW1vdmUoJndvcmxkKTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+ cmVtb3ZlVXNlclNjcmlwdHMod29ybGQpOwogfQogCiB2b2lkIFBhZ2VHcm91cDo6cmVtb3ZlVXNl clN0eWxlU2hlZXRzRnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQpCkBAIC0zNjgsNyAr MzQ2LDcgQEAgdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTdHlsZVNoZWV0c0Zyb21Xb3JsZChE T01XcmFwcGVyV29ybGQmIHdvcmxkKQogCiB2b2lkIFBhZ2VHcm91cDo6cmVtb3ZlQWxsVXNlckNv bnRlbnQoKQogewotICAgIG1fdXNlclNjcmlwdHMgPSBudWxscHRyOworICAgIG1fdXNlckNvbnRl bnRDb250cm9sbGVyLT5yZW1vdmVBbGxVc2VyQ29udGVudCgpOwogCiAgICAgaWYgKG1fdXNlclN0 eWxlU2hlZXRzKSB7CiAgICAgICAgIG1fdXNlclN0eWxlU2hlZXRzID0gbnVsbHB0cjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2VHcm91cC5oCmluZGV4IGQ2MmU0Njg1MjI5YmIwODZlOGUyNGJkMGMzMDIyNWIzZDY4 ODU0ZmUuLmE5ZjVhODAxYWViOWRmYjYwNTk1MjliM2MzZWU1OWIxMTEzZGM4ZDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlR3JvdXAuaApAQCAtOTQsMTMgKzk0LDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogICAgICAgICB2b2lkIGFkZFVzZXJTY3JpcHRUb1dvcmxkKERPTVdyYXBwZXJXb3JsZCYsIGNv bnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBVUkwmLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgd2hp dGVsaXN0LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxhY2tsaXN0LCBVc2VyU2NyaXB0SW5qZWN0 aW9uVGltZSwgVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyk7CiAgICAgICAgIHZvaWQgYWRkVXNl clN0eWxlU2hlZXRUb1dvcmxkKERPTVdyYXBwZXJXb3JsZCYsIGNvbnN0IFN0cmluZyYgc291cmNl LCBjb25zdCBVUkwmLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgd2hpdGVsaXN0LCBjb25zdCBWZWN0 b3I8U3RyaW5nPiYgYmxhY2tsaXN0LCBVc2VyQ29udGVudEluamVjdGVkRnJhbWVzLCBVc2VyU3R5 bGVMZXZlbCA9IFVzZXJTdHlsZVVzZXJMZXZlbCwgVXNlclN0eWxlSW5qZWN0aW9uVGltZSA9IElu amVjdEluRXhpc3RpbmdEb2N1bWVudHMpOwotICAgICAgICB2b2lkIHJlbW92ZVVzZXJTY3JpcHRG cm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiwgY29uc3QgVVJMJik7CiAgICAgICAgIHZvaWQgcmVt b3ZlVXNlclN0eWxlU2hlZXRGcm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiwgY29uc3QgVVJMJik7 CisgICAgICAgIHZvaWQgcmVtb3ZlVXNlclNjcmlwdEZyb21Xb3JsZChET01XcmFwcGVyV29ybGQm LCBjb25zdCBVUkwmKTsKICAgICAgICAgdm9pZCByZW1vdmVVc2VyU2NyaXB0c0Zyb21Xb3JsZChE T01XcmFwcGVyV29ybGQmKTsKICAgICAgICAgdm9pZCByZW1vdmVVc2VyU3R5bGVTaGVldHNGcm9t V29ybGQoRE9NV3JhcHBlcldvcmxkJik7CiAgICAgICAgIHZvaWQgcmVtb3ZlQWxsVXNlckNvbnRl bnQoKTsKIAotICAgICAgICBjb25zdCBVc2VyU2NyaXB0TWFwKiB1c2VyU2NyaXB0cygpIGNvbnN0 IHsgcmV0dXJuIG1fdXNlclNjcmlwdHMuZ2V0KCk7IH0KICAgICAgICAgY29uc3QgVXNlclN0eWxl U2hlZXRNYXAqIHVzZXJTdHlsZVNoZWV0cygpIGNvbnN0IHsgcmV0dXJuIG1fdXNlclN0eWxlU2hl ZXRzLmdldCgpOyB9CiAKICAgICAgICAgR3JvdXBTZXR0aW5ncyYgZ3JvdXBTZXR0aW5ncygpIGNv bnN0IHsgcmV0dXJuICptX2dyb3VwU2V0dGluZ3M7IH0KQEAgLTEyNSw3ICsxMjQsNiBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwg UmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+PiBtX3RyYW5zaWVudExvY2FsU3RvcmFnZU1hcDsKIAog ICAgICAgICBSZWZQdHI8VXNlckNvbnRlbnRDb250cm9sbGVyPiBtX3VzZXJDb250ZW50Q29udHJv bGxlcjsKLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFVzZXJTY3JpcHRNYXA+IG1fdXNlclNjcmlw dHM7CiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxVc2VyU3R5bGVTaGVldE1hcD4gbV91c2VyU3R5 bGVTaGVldHM7CiAKICAgICAgICAgY29uc3Qgc3RkOjp1bmlxdWVfcHRyPEdyb3VwU2V0dGluZ3M+ IG1fZ3JvdXBTZXR0aW5nczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNv bnRlbnRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250 cm9sbGVyLmNwcAppbmRleCAxZjk5YmE0OWZlNTQwNzVlYzAyMGIwYmFkMWE3ZjhhY2NhYmM3ZDgw Li5lZDQ1ODVmNWE1ZmVhZjg4NDI1NGExMjhmY2E3YjliYzg2ZGYxMjJkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuY3BwCkBAIC01Niw0ICs1Niw0NyBA QCB2b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlUGFnZShQYWdlJiBwYWdlKQogICAg IG1fcGFnZXMucmVtb3ZlKCZwYWdlKTsKIH0KIAordm9pZCBVc2VyQ29udGVudENvbnRyb2xsZXI6 OmFkZFVzZXJTY3JpcHQoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCwgc3RkOjp1bmlxdWVfcHRyPFVz ZXJTY3JpcHQ+IHVzZXJTY3JpcHQpCit7CisgICAgaWYgKCFtX3VzZXJTY3JpcHRzKQorICAgICAg ICBtX3VzZXJTY3JpcHRzID0gc3RkOjptYWtlX3VuaXF1ZTxVc2VyU2NyaXB0TWFwPigpOworCisg ICAgYXV0byYgc2NyaXB0c0luV29ybGQgPSBtX3VzZXJTY3JpcHRzLT5hZGQoJndvcmxkLCBudWxs cHRyKS5pdGVyYXRvci0+dmFsdWU7CisgICAgaWYgKCFzY3JpcHRzSW5Xb3JsZCkKKyAgICAgICAg c2NyaXB0c0luV29ybGQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTY3JpcHRWZWN0b3I+KCk7Cisg ICAgc2NyaXB0c0luV29ybGQtPmFwcGVuZChzdGQ6Om1vdmUodXNlclNjcmlwdCkpOworfQorCit2 b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclNjcmlwdChET01XcmFwcGVyV29y bGQmIHdvcmxkLCBjb25zdCBVUkwmIHVybCkKK3sKKyAgICBpZiAoIW1fdXNlclNjcmlwdHMpCisg ICAgICAgIHJldHVybjsKKworICAgIGF1dG8gaXQgPSBtX3VzZXJTY3JpcHRzLT5maW5kKCZ3b3Js ZCk7CisgICAgaWYgKGl0ID09IG1fdXNlclNjcmlwdHMtPmVuZCgpKQorICAgICAgICByZXR1cm47 CisKKyAgICBhdXRvIHNjcmlwdHMgPSBpdC0+dmFsdWUuZ2V0KCk7CisgICAgZm9yIChpbnQgaSA9 IHNjcmlwdHMtPnNpemUoKSAtIDE7IGkgPj0gMDsgLS1pKSB7CisgICAgICAgIGlmIChzY3JpcHRz LT5hdChpKS0+dXJsKCkgPT0gdXJsKQorICAgICAgICAgICAgc2NyaXB0cy0+cmVtb3ZlKGkpOwor ICAgIH0KKworICAgIGlmIChzY3JpcHRzLT5pc0VtcHR5KCkpCisgICAgICAgIG1fdXNlclNjcmlw dHMtPnJlbW92ZShpdCk7Cit9CisKK3ZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVV c2VyU2NyaXB0cyhET01XcmFwcGVyV29ybGQmIHdvcmxkKQoreworICAgIGlmICghbV91c2VyU2Ny aXB0cykKKyAgICAgICAgcmV0dXJuOworCisgICAgbV91c2VyU2NyaXB0cy0+cmVtb3ZlKCZ3b3Js ZCk7Cit9CisKK3ZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVBbGxVc2VyQ29udGVu dCgpCit7CisgICAgbV91c2VyU2NyaXB0cyA9IG51bGxwdHI7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250 cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oCmlu ZGV4IDc2NTI5ZDJkNGU1ZmRjYzNlNTBiNjJiYTYzMjcxNTE0MjdiMzczZjQuLjc2NTFjNjNkODU4 YTNjOWU3OGNjNWU4YTQ0NmVlZTA0ZDg4YzRiMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9V c2VyQ29udGVudENvbnRyb2xsZXIuaApAQCAtMjYsMTEgKzI2LDEwIEBACiAjaWZuZGVmIFVzZXJD b250ZW50Q29udHJvbGxlcl9oCiAjZGVmaW5lIFVzZXJDb250ZW50Q29udHJvbGxlcl9oCiAKLSNp bmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUgIlVzZXJTY3JpcHRUeXBlcy5oIgogI2lu Y2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNs dWRlIDx3dGYvUmVmUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTQ3LDEwICs0NiwyMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBhZGRQYWdl KFBhZ2UmKTsKICAgICB2b2lkIHJlbW92ZVBhZ2UoUGFnZSYpOwogCisgICAgY29uc3QgVXNlclNj cmlwdE1hcCogdXNlclNjcmlwdHMoKSBjb25zdCB7IHJldHVybiBtX3VzZXJTY3JpcHRzLmdldCgp OyB9CisKKyAgICB2b2lkIGFkZFVzZXJTY3JpcHQoRE9NV3JhcHBlcldvcmxkJiwgc3RkOjp1bmlx dWVfcHRyPFVzZXJTY3JpcHQ+KTsKKyAgICB2b2lkIHJlbW92ZVVzZXJTY3JpcHQoRE9NV3JhcHBl cldvcmxkJiwgY29uc3QgVVJMJik7CisgICAgdm9pZCByZW1vdmVVc2VyU2NyaXB0cyhET01XcmFw cGVyV29ybGQmKTsKKworICAgIHZvaWQgcmVtb3ZlQWxsVXNlckNvbnRlbnQoKTsKKwogcHJpdmF0 ZToKICAgICBVc2VyQ29udGVudENvbnRyb2xsZXIoKTsKIAogICAgIEhhc2hTZXQ8UGFnZSo+IG1f cGFnZXM7CisKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8VXNlclNjcmlwdE1hcD4gbV91c2VyU2NyaXB0 czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 221701 2014-01-20 15:57:49 -0800 2014-01-20 15:59:00 -0800 Patch bug-127317-20140120155748.patch text/plain 10783 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIzM2QwNzczYzA3OWI3 YTliMjA5ZjFmNzIzZmRjN2YxY2I1YzAzYS4uMjlkNDVmZWFlNzkyMjU0OThmNzBmMTg2ZGQ2ODhk Y2JkNjU2ODkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw3ICsxLDM0IEBACiAyMDE0LTAxLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlckNvbnRlbnRD b250cm9sbGVyIHNob3VsZCBrZWVwIHRyYWNrIG9mIHVzZXIgc2NyaXB0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MzE3CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xNTg2MTI5Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb3ZlIGhhbmRsaW5nIG9mIHVzZXIgc2NyaXB0cyBmcm9tIFBhZ2VHcm91 cCB0byBVc2VyQ29udGVudENvbnRyb2xsZXIuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjppbmplY3RVc2VyU2NyaXB0cyk6CisgICAgICAgICog cGFnZS9QYWdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjphZGRVc2Vy U2NyaXB0VG9Xb3JsZCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OnJlbW92ZVVzZXJT Y3JpcHRGcm9tV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjpyZW1vdmVVc2Vy U2NyaXB0c0Zyb21Xb3JsZCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OnJlbW92ZUFs bFVzZXJDb250ZW50KToKKyAgICAgICAgKiBwYWdlL1BhZ2VHcm91cC5oOgorICAgICAgICAqIHBh Z2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250 ZW50Q29udHJvbGxlcjo6YWRkVXNlclNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29u dGVudENvbnRyb2xsZXI6OnJlbW92ZVVzZXJTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VXNl ckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVVc2VyU2NyaXB0cyk6CisgICAgICAgIChXZWJDb3Jl OjpVc2VyQ29udGVudENvbnRyb2xsZXI6OnJlbW92ZUFsbFVzZXJDb250ZW50KToKKyAgICAgICAg KiBwYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6VXNlckNv bnRlbnRDb250cm9sbGVyOjp1c2VyU2NyaXB0cyk6CisKKzIwMTQtMDEtMjAgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBHaXZlIGVhY2ggcGFnZSBhIFVz ZXJDb250ZW50Q29udHJvbGxlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzE1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTg2MTI5Nj4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmlu ZGV4IDRmYmQzN2YxODdiYWU1YWFhZjA1ODY0OTllNjM5YzkwM2M1MWRjMTcuLjZmNmNiOTRiNThm NzMyZjljMmE5ZWI0NjRiZDM0ZmYyMzM1NzQ1OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC05 Miw2ICs5Miw3IEBACiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiVGV4dE5v ZGVUcmF2ZXJzYWwuaCIKICNpbmNsdWRlICJUZXh0UmVzb3VyY2VEZWNvZGVyLmgiCisjaW5jbHVk ZSAiVXNlckNvbnRlbnRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiVXNlckNvbnRlbnRVUkxQYXR0 ZXJuLmgiCiAjaW5jbHVkZSAiVXNlclR5cGluZ0dlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRl ICJWaXNpYmxlVW5pdHMuaCIKQEAgLTcwMywxMyArNzA0LDE3IEBAIHZvaWQgRnJhbWU6OmluamVj dFVzZXJTY3JpcHRzKFVzZXJTY3JpcHRJbmplY3Rpb25UaW1lIGluamVjdGlvblRpbWUpCiAgICAg aWYgKGxvYWRlcigpLnN0YXRlTWFjaGluZSgpLT5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50 KCkgJiYgIXNldHRpbmdzKCkuc2hvdWxkSW5qZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURv Y3VtZW50KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIFVzZXJDb250ZW50Q29udHJvbGxlciog dXNlckNvbnRlbnRDb250cm9sbGVyID0gbV9wYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsK KyAgICBpZiAoIXVzZXJDb250ZW50Q29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCiAgICAg Ly8gV2FsayB0aGUgaGFzaHRhYmxlLiBJbmplY3QgYnkgd29ybGQuCi0gICAgY29uc3QgVXNlclNj cmlwdE1hcCogdXNlclNjcmlwdHMgPSBtX3BhZ2UtPmdyb3VwKCkudXNlclNjcmlwdHMoKTsKKyAg ICBjb25zdCBVc2VyU2NyaXB0TWFwKiB1c2VyU2NyaXB0cyA9IHVzZXJDb250ZW50Q29udHJvbGxl ci0+dXNlclNjcmlwdHMoKTsKICAgICBpZiAoIXVzZXJTY3JpcHRzKQogICAgICAgICByZXR1cm47 CiAKLSAgICBmb3IgKGF1dG8gaXQgPSB1c2VyU2NyaXB0cy0+YmVnaW4oKSwgZW5kID0gdXNlclNj cmlwdHMtPmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGluamVjdFVzZXJTY3JpcHRz Rm9yV29ybGQoKml0LT5rZXkuZ2V0KCksICppdC0+dmFsdWUsIGluamVjdGlvblRpbWUpOworICAg IGZvciAoY29uc3QgYXV0byYgd29ybGRBbmRVc2VyU2NyaXB0IDogKnVzZXJTY3JpcHRzKQorICAg ICAgICBpbmplY3RVc2VyU2NyaXB0c0ZvcldvcmxkKCp3b3JsZEFuZFVzZXJTY3JpcHQua2V5LCAq d29ybGRBbmRVc2VyU2NyaXB0LnZhbHVlLCBpbmplY3Rpb25UaW1lKTsKIH0KIAogdm9pZCBGcmFt ZTo6aW5qZWN0VXNlclNjcmlwdHNGb3JXb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBjb25z dCBVc2VyU2NyaXB0VmVjdG9yJiB1c2VyU2NyaXB0cywgVXNlclNjcmlwdEluamVjdGlvblRpbWUg aW5qZWN0aW9uVGltZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3Vw LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcAppbmRleCBiN2ZjZDIyMmJh YzQ4M2E0NTQwMWM4YjUwZDg3MGNkZjViMmNiNGYyLi5iYThkMWRlYzNhMDY1NzU5YTA1Yjc3ZmI1 MjYwZDc4N2E5NGZhYjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91 cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCkBAIC03Myw2ICs3 Myw3IEBAIFBhZ2VHcm91cDo6UGFnZUdyb3VwKGNvbnN0IFN0cmluZyYgbmFtZSkKIFBhZ2VHcm91 cDo6UGFnZUdyb3VwKFBhZ2UmIHBhZ2UpCiAgICAgOiBtX3Zpc2l0ZWRMaW5rc1BvcHVsYXRlZChm YWxzZSkKICAgICAsIG1faWRlbnRpZmllcihnZXRVbmlxdWVJZGVudGlmaWVyKCkpCisgICAgLCBt X3VzZXJDb250ZW50Q29udHJvbGxlcihVc2VyQ29udGVudENvbnRyb2xsZXI6OmNyZWF0ZSgpKQog ICAgICwgbV9ncm91cFNldHRpbmdzKHN0ZDo6bWFrZV91bmlxdWU8R3JvdXBTZXR0aW5ncz4oKSkK IHsKICAgICBhZGRQYWdlKHBhZ2UpOwpAQCAtMjc5LDEyICsyODAsNyBAQCBTdG9yYWdlTmFtZXNw YWNlKiBQYWdlR3JvdXA6OnRyYW5zaWVudExvY2FsU3RvcmFnZShTZWN1cml0eU9yaWdpbiogdG9w T3JpZ2luKQogdm9pZCBQYWdlR3JvdXA6OmFkZFVzZXJTY3JpcHRUb1dvcmxkKERPTVdyYXBwZXJX b3JsZCYgd29ybGQsIGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBVUkwmIHVybCwgY29uc3Qg VmVjdG9yPFN0cmluZz4mIHdoaXRlbGlzdCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsYWNrbGlz dCwgVXNlclNjcmlwdEluamVjdGlvblRpbWUgaW5qZWN0aW9uVGltZSwgVXNlckNvbnRlbnRJbmpl Y3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcykKIHsKICAgICBhdXRvIHVzZXJTY3JpcHQgPSBzdGQ6 Om1ha2VfdW5pcXVlPFVzZXJTY3JpcHQ+KHNvdXJjZSwgdXJsLCB3aGl0ZWxpc3QsIGJsYWNrbGlz dCwgaW5qZWN0aW9uVGltZSwgaW5qZWN0ZWRGcmFtZXMpOwotICAgIGlmICghbV91c2VyU2NyaXB0 cykKLSAgICAgICAgbV91c2VyU2NyaXB0cyA9IHN0ZDo6bWFrZV91bmlxdWU8VXNlclNjcmlwdE1h cD4oKTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8VXNlclNjcmlwdFZlY3Rvcj4mIHNjcmlwdHNJbldv cmxkID0gbV91c2VyU2NyaXB0cy0+YWRkKCZ3b3JsZCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVl OwotICAgIGlmICghc2NyaXB0c0luV29ybGQpCi0gICAgICAgIHNjcmlwdHNJbldvcmxkID0gc3Rk OjptYWtlX3VuaXF1ZTxVc2VyU2NyaXB0VmVjdG9yPigpOwotICAgIHNjcmlwdHNJbldvcmxkLT5h cHBlbmQoc3RkOjptb3ZlKHVzZXJTY3JpcHQpKTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxl ci0+YWRkVXNlclNjcmlwdCh3b3JsZCwgc3RkOjptb3ZlKHVzZXJTY3JpcHQpKTsKIH0KIAogdm9p ZCBQYWdlR3JvdXA6OmFkZFVzZXJTdHlsZVNoZWV0VG9Xb3JsZChET01XcmFwcGVyV29ybGQmIHdv cmxkLCBjb25zdCBTdHJpbmcmIHNvdXJjZSwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiB3aGl0ZWxpc3QsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibGFja2xpc3QsIFVzZXJD b250ZW50SW5qZWN0ZWRGcmFtZXMgaW5qZWN0ZWRGcmFtZXMsIFVzZXJTdHlsZUxldmVsIGxldmVs LCBVc2VyU3R5bGVJbmplY3Rpb25UaW1lIGluamVjdGlvblRpbWUpCkBAIC0zMDMsMjEgKzI5OSw3 IEBAIHZvaWQgUGFnZUdyb3VwOjphZGRVc2VyU3R5bGVTaGVldFRvV29ybGQoRE9NV3JhcHBlcldv cmxkJiB3b3JsZCwgY29uc3QgU3RyaW5nJiBzCiAKIHZvaWQgUGFnZUdyb3VwOjpyZW1vdmVVc2Vy U2NyaXB0RnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVSTCYgdXJsKQog ewotICAgIGlmICghbV91c2VyU2NyaXB0cykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0byBp dCA9IG1fdXNlclNjcmlwdHMtPmZpbmQoJndvcmxkKTsKLSAgICBpZiAoaXQgPT0gbV91c2VyU2Ny aXB0cy0+ZW5kKCkpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAgICBhdXRvIHNjcmlwdHMgPSBp dC0+dmFsdWUuZ2V0KCk7Ci0gICAgZm9yIChpbnQgaSA9IHNjcmlwdHMtPnNpemUoKSAtIDE7IGkg Pj0gMDsgLS1pKSB7Ci0gICAgICAgIGlmIChzY3JpcHRzLT5hdChpKS0+dXJsKCkgPT0gdXJsKQot ICAgICAgICAgICAgc2NyaXB0cy0+cmVtb3ZlKGkpOwotICAgIH0KLSAgICAKLSAgICBpZiAoc2Ny aXB0cy0+aXNFbXB0eSgpKQotICAgICAgICBtX3VzZXJTY3JpcHRzLT5yZW1vdmUoaXQpOworICAg IG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5yZW1vdmVVc2VyU2NyaXB0KHdvcmxkLCB1cmwpOwog fQogCiB2b2lkIFBhZ2VHcm91cDo6cmVtb3ZlVXNlclN0eWxlU2hlZXRGcm9tV29ybGQoRE9NV3Jh cHBlcldvcmxkJiB3b3JsZCwgY29uc3QgVVJMJiB1cmwpCkBAIC0zNDksMTAgKzMzMSw3IEBAIHZv aWQgUGFnZUdyb3VwOjpyZW1vdmVVc2VyU3R5bGVTaGVldEZyb21Xb3JsZChET01XcmFwcGVyV29y bGQmIHdvcmxkLCBjb25zdCBVUkwmCiAKIHZvaWQgUGFnZUdyb3VwOjpyZW1vdmVVc2VyU2NyaXB0 c0Zyb21Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkKQogewotICAgIGlmICghbV91c2VyU2Ny aXB0cykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV91c2VyU2NyaXB0cy0+cmVtb3ZlKCZ3b3Js ZCk7CisgICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPnJlbW92ZVVzZXJTY3JpcHRzKHdvcmxk KTsKIH0KIAogdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTdHlsZVNoZWV0c0Zyb21Xb3JsZChE T01XcmFwcGVyV29ybGQmIHdvcmxkKQpAQCAtMzY4LDcgKzM0Nyw3IEBAIHZvaWQgUGFnZUdyb3Vw OjpyZW1vdmVVc2VyU3R5bGVTaGVldHNGcm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCkK IAogdm9pZCBQYWdlR3JvdXA6OnJlbW92ZUFsbFVzZXJDb250ZW50KCkKIHsKLSAgICBtX3VzZXJT Y3JpcHRzID0gbnVsbHB0cjsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlQWxs VXNlckNvbnRlbnQoKTsKIAogICAgIGlmIChtX3VzZXJTdHlsZVNoZWV0cykgewogICAgICAgICBt X3VzZXJTdHlsZVNoZWV0cyA9IG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2VHcm91cC5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuaAppbmRleCBk NjJlNDY4NTIyOWJiMDg2ZThlMjRiZDBjMzAyMjViM2Q2ODg1NGZlLi5hOWY1YTgwMWFlYjlkZmI2 MDU5NTI5YjNjM2VlNTliMTExM2RjOGQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2VHcm91cC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKQEAgLTk0 LDEzICs5NCwxMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCBhZGRVc2Vy U2NyaXB0VG9Xb3JsZChET01XcmFwcGVyV29ybGQmLCBjb25zdCBTdHJpbmcmIHNvdXJjZSwgY29u c3QgVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHdoaXRlbGlzdCwgY29uc3QgVmVjdG9yPFN0 cmluZz4mIGJsYWNrbGlzdCwgVXNlclNjcmlwdEluamVjdGlvblRpbWUsIFVzZXJDb250ZW50SW5q ZWN0ZWRGcmFtZXMpOwogICAgICAgICB2b2lkIGFkZFVzZXJTdHlsZVNoZWV0VG9Xb3JsZChET01X cmFwcGVyV29ybGQmLCBjb25zdCBTdHJpbmcmIHNvdXJjZSwgY29uc3QgVVJMJiwgY29uc3QgVmVj dG9yPFN0cmluZz4mIHdoaXRlbGlzdCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsYWNrbGlzdCwg VXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcywgVXNlclN0eWxlTGV2ZWwgPSBVc2VyU3R5bGVVc2Vy TGV2ZWwsIFVzZXJTdHlsZUluamVjdGlvblRpbWUgPSBJbmplY3RJbkV4aXN0aW5nRG9jdW1lbnRz KTsKLSAgICAgICAgdm9pZCByZW1vdmVVc2VyU2NyaXB0RnJvbVdvcmxkKERPTVdyYXBwZXJXb3Js ZCYsIGNvbnN0IFVSTCYpOwogICAgICAgICB2b2lkIHJlbW92ZVVzZXJTdHlsZVNoZWV0RnJvbVdv cmxkKERPTVdyYXBwZXJXb3JsZCYsIGNvbnN0IFVSTCYpOworICAgICAgICB2b2lkIHJlbW92ZVVz ZXJTY3JpcHRGcm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJiwgY29uc3QgVVJMJik7CiAgICAgICAg IHZvaWQgcmVtb3ZlVXNlclNjcmlwdHNGcm9tV29ybGQoRE9NV3JhcHBlcldvcmxkJik7CiAgICAg ICAgIHZvaWQgcmVtb3ZlVXNlclN0eWxlU2hlZXRzRnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYp OwogICAgICAgICB2b2lkIHJlbW92ZUFsbFVzZXJDb250ZW50KCk7CiAKLSAgICAgICAgY29uc3Qg VXNlclNjcmlwdE1hcCogdXNlclNjcmlwdHMoKSBjb25zdCB7IHJldHVybiBtX3VzZXJTY3JpcHRz LmdldCgpOyB9CiAgICAgICAgIGNvbnN0IFVzZXJTdHlsZVNoZWV0TWFwKiB1c2VyU3R5bGVTaGVl dHMoKSBjb25zdCB7IHJldHVybiBtX3VzZXJTdHlsZVNoZWV0cy5nZXQoKTsgfQogCiAgICAgICAg IEdyb3VwU2V0dGluZ3MmIGdyb3VwU2V0dGluZ3MoKSBjb25zdCB7IHJldHVybiAqbV9ncm91cFNl dHRpbmdzOyB9CkBAIC0xMjUsNyArMTI0LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICBIYXNoTWFwPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4sIFJlZlB0cjxTdG9yYWdlTmFtZXNwYWNl Pj4gbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VNYXA7CiAKICAgICAgICAgUmVmUHRyPFVzZXJDb250 ZW50Q29udHJvbGxlcj4gbV91c2VyQ29udGVudENvbnRyb2xsZXI7Ci0gICAgICAgIHN0ZDo6dW5p cXVlX3B0cjxVc2VyU2NyaXB0TWFwPiBtX3VzZXJTY3JpcHRzOwogICAgICAgICBzdGQ6OnVuaXF1 ZV9wdHI8VXNlclN0eWxlU2hlZXRNYXA+IG1fdXNlclN0eWxlU2hlZXRzOwogCiAgICAgICAgIGNv bnN0IHN0ZDo6dW5pcXVlX3B0cjxHcm91cFNldHRpbmdzPiBtX2dyb3VwU2V0dGluZ3M7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAKaW5kZXggMWY5OWJh NDlmZTU0MDc1ZWMwMjBiMGJhZDFhN2Y4YWNjYWJjN2Q4MC4uZWQ0NTg1ZjVhNWZlYWY4ODQyNTRh MTI4ZmNhN2I5YmM4NmRmMTIyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2Vy Q29udGVudENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRl bnRDb250cm9sbGVyLmNwcApAQCAtNTYsNCArNTYsNDcgQEAgdm9pZCBVc2VyQ29udGVudENvbnRy b2xsZXI6OnJlbW92ZVBhZ2UoUGFnZSYgcGFnZSkKICAgICBtX3BhZ2VzLnJlbW92ZSgmcGFnZSk7 CiB9CiAKK3ZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjphZGRVc2VyU2NyaXB0KERPTVdyYXBw ZXJXb3JsZCYgd29ybGQsIHN0ZDo6dW5pcXVlX3B0cjxVc2VyU2NyaXB0PiB1c2VyU2NyaXB0KQor eworICAgIGlmICghbV91c2VyU2NyaXB0cykKKyAgICAgICAgbV91c2VyU2NyaXB0cyA9IHN0ZDo6 bWFrZV91bmlxdWU8VXNlclNjcmlwdE1hcD4oKTsKKworICAgIGF1dG8mIHNjcmlwdHNJbldvcmxk ID0gbV91c2VyU2NyaXB0cy0+YWRkKCZ3b3JsZCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwor ICAgIGlmICghc2NyaXB0c0luV29ybGQpCisgICAgICAgIHNjcmlwdHNJbldvcmxkID0gc3RkOjpt YWtlX3VuaXF1ZTxVc2VyU2NyaXB0VmVjdG9yPigpOworICAgIHNjcmlwdHNJbldvcmxkLT5hcHBl bmQoc3RkOjptb3ZlKHVzZXJTY3JpcHQpKTsKK30KKwordm9pZCBVc2VyQ29udGVudENvbnRyb2xs ZXI6OnJlbW92ZVVzZXJTY3JpcHQoRE9NV3JhcHBlcldvcmxkJiB3b3JsZCwgY29uc3QgVVJMJiB1 cmwpCit7CisgICAgaWYgKCFtX3VzZXJTY3JpcHRzKQorICAgICAgICByZXR1cm47CisKKyAgICBh dXRvIGl0ID0gbV91c2VyU2NyaXB0cy0+ZmluZCgmd29ybGQpOworICAgIGlmIChpdCA9PSBtX3Vz ZXJTY3JpcHRzLT5lbmQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgYXV0byBzY3JpcHRzID0g aXQtPnZhbHVlLmdldCgpOworICAgIGZvciAoaW50IGkgPSBzY3JpcHRzLT5zaXplKCkgLSAxOyBp ID49IDA7IC0taSkgeworICAgICAgICBpZiAoc2NyaXB0cy0+YXQoaSktPnVybCgpID09IHVybCkK KyAgICAgICAgICAgIHNjcmlwdHMtPnJlbW92ZShpKTsKKyAgICB9CisKKyAgICBpZiAoc2NyaXB0 cy0+aXNFbXB0eSgpKQorICAgICAgICBtX3VzZXJTY3JpcHRzLT5yZW1vdmUoaXQpOworfQorCit2 b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cmVtb3ZlVXNlclNjcmlwdHMoRE9NV3JhcHBlcldv cmxkJiB3b3JsZCkKK3sKKyAgICBpZiAoIW1fdXNlclNjcmlwdHMpCisgICAgICAgIHJldHVybjsK KworICAgIG1fdXNlclNjcmlwdHMtPnJlbW92ZSgmd29ybGQpOworfQorCit2b2lkIFVzZXJDb250 ZW50Q29udHJvbGxlcjo6cmVtb3ZlQWxsVXNlckNvbnRlbnQoKQoreworICAgIG1fdXNlclNjcmlw dHMgPSBudWxscHRyOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oIGIvU291cmNlL1dlYkNv cmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaAppbmRleCA3NjUyOWQyZDRlNWZkY2MzZTUw YjYyYmE2MzI3MTUxNDI3YjM3M2Y0Li43NjUxYzYzZDg1OGEzYzllNzhjYzVlOGE0NDZlZWUwNGQ4 OGM0YjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJv bGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmgK QEAgLTI2LDExICsyNiwxMCBAQAogI2lmbmRlZiBVc2VyQ29udGVudENvbnRyb2xsZXJfaAogI2Rl ZmluZSBVc2VyQ29udGVudENvbnRyb2xsZXJfaAogCi0jaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4K KyNpbmNsdWRlICJVc2VyU2NyaXB0VHlwZXMuaCIKICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgog I2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgotI2lu Y2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NywxMCAr NDYsMjAgQEAgcHVibGljOgogICAgIHZvaWQgYWRkUGFnZShQYWdlJik7CiAgICAgdm9pZCByZW1v dmVQYWdlKFBhZ2UmKTsKIAorICAgIGNvbnN0IFVzZXJTY3JpcHRNYXAqIHVzZXJTY3JpcHRzKCkg Y29uc3QgeyByZXR1cm4gbV91c2VyU2NyaXB0cy5nZXQoKTsgfQorCisgICAgdm9pZCBhZGRVc2Vy U2NyaXB0KERPTVdyYXBwZXJXb3JsZCYsIHN0ZDo6dW5pcXVlX3B0cjxVc2VyU2NyaXB0Pik7Cisg ICAgdm9pZCByZW1vdmVVc2VyU2NyaXB0KERPTVdyYXBwZXJXb3JsZCYsIGNvbnN0IFVSTCYpOwor ICAgIHZvaWQgcmVtb3ZlVXNlclNjcmlwdHMoRE9NV3JhcHBlcldvcmxkJik7CisKKyAgICB2b2lk IHJlbW92ZUFsbFVzZXJDb250ZW50KCk7CisKIHByaXZhdGU6CiAgICAgVXNlckNvbnRlbnRDb250 cm9sbGVyKCk7CiAKICAgICBIYXNoU2V0PFBhZ2UqPiBtX3BhZ2VzOworCisgICAgc3RkOjp1bmlx dWVfcHRyPFVzZXJTY3JpcHRNYXA+IG1fdXNlclNjcmlwdHM7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCg==