115778 2013-05-08 00:41:30 -0700 Fix one more place that needed to use adoptCF/NS 2013-05-08 02:40:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue oldest_to_newest 886189 0 darin 2013-05-08 00:41:30 -0700 Fix one more place that needed to use adoptCF/NS 886190 1 201037 darin 2013-05-08 00:42:47 -0700 Created attachment 201037 Patch 886255 2 201037 commit-queue 2013-05-08 02:40:25 -0700 Comment on attachment 201037 Patch Clearing flags on attachment: 201037 Committed r149725: <http://trac.webkit.org/changeset/149725> 886256 3 commit-queue 2013-05-08 02:40:27 -0700 All reviewed patches have been landed. Closing bug. 201037 2013-05-08 00:42:47 -0700 2013-05-08 02:40:25 -0700 Patch bug-115778-20130508004153.patch text/plain 11194 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NzE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWEyNWUzMTY0MzExZjU5NjhkMWJhZWYxYzViMWY0OGRk MTk0M2FmZC4uNGFkMTY5YjU4MWM3ODUxY2U4ZmE2MjQwZGQ2MDVhZGFhMGE3ZDA2OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEzLTA1LTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAg ICBGaXggb25lIG1vcmUgcGxhY2UgdGhhdCBuZWVkZWQgdG8gdXNlIGFkb3B0Q0YvTlMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTc3OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vdCBzdXJlIHdoeSBJ IG1pc3NlZCB0aGlzIGNvZGUgbGFzdCB0aW1lLCBidXQgZm91bmQgYSBiaXQgbW9yZSBjb2RlIHRo YXQgbmVlZHMKKyAgICAgICAgdG8gc3dpdGNoIHRvIHRoZSBuZXdlciBzdHlsZSBhZG9wdENGL05T LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9jZi9XZWJBcmNoaXZlRHVtcFN1cHBvcnQu Y3BwOgorICAgICAgICAoY29udmVydFdlYlJlc291cmNlRGF0YVRvU3RyaW5nKTogVXNlIGFkb3B0 Q0YuCisgICAgICAgIChjb252ZXJ0V2ViUmVzb3VyY2VSZXNwb25zZVRvRGljdGlvbmFyeSk6IERp dHRvLgorICAgICAgICAoY3JlYXRlWE1MU3RyaW5nRnJvbVdlYkFyY2hpdmVEYXRhKTogRGl0dG8u CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9tYWMvV2ViQXJjaGl2ZUR1bXBTdXBwb3J0TWFj Lm1tOgorICAgICAgICAoY3JlYXRlQ0ZVUkxSZXNwb25zZUZyb21SZXNwb25zZURhdGEpOiBVc2Ug YWRvcHROUyBhbmQgYWRvcHRDRi4KKwogMjAxMy0wNS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBh cHBsZS5jb20+CiAKICAgICAgICAgVXNlIGFkb3B0Q0YgYW5kIGFkb3B0TlMgaW4gbW9yZSBwbGFj ZXMsIHRlc3QgY29kZSBhbmQgY29kZSBub3QgY29tcGlsZWQgb24gTWFjCmRpZmYgLS1naXQgYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL2NmL1dlYkFyY2hpdmVEdW1wU3VwcG9ydC5jcHAgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL2NmL1dlYkFyY2hpdmVEdW1wU3VwcG9ydC5jcHAKaW5kZXggYWZi MzY3MTM1MGM2NDg2N2RjZWQ1ODQwMTM2N2ZlZWRkZDEyZjNkYS4uMTkxODQzMTc4OTA5YzRiZTYz MDljMTUwOWZiZjM0YjNiYmRlOWU2MiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9jZi9XZWJBcmNoaXZlRHVtcFN1cHBvcnQuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvY2YvV2ViQXJjaGl2ZUR1bXBTdXBwb3J0LmNwcApAQCAtNzAsNyArNzAsNyBAQCBzdGF0aWMg dm9pZCBjb252ZXJ0V2ViUmVzb3VyY2VEYXRhVG9TdHJpbmcoQ0ZNdXRhYmxlRGljdGlvbmFyeVJl ZiByZXNvdXJjZSkKICAgICAgICAgICAgIHN0cmluZ0VuY29kaW5nID0ga0NGU3RyaW5nRW5jb2Rp bmdVVEY4OwogCiAgICAgICAgIENGRGF0YVJlZiBkYXRhID0gc3RhdGljX2Nhc3Q8Q0ZEYXRhUmVm PihDRkRpY3Rpb25hcnlHZXRWYWx1ZShyZXNvdXJjZSwgQ0ZTVFIoIldlYlJlc291cmNlRGF0YSIp KSk7Ci0gICAgICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gZGF0YUFzU3RyaW5nKEFkb3B0Q0Ys IENGU3RyaW5nQ3JlYXRlRnJvbUV4dGVybmFsUmVwcmVzZW50YXRpb24oa0NGQWxsb2NhdG9yRGVm YXVsdCwgZGF0YSwgc3RyaW5nRW5jb2RpbmcpKTsKKyAgICAgICAgUmV0YWluUHRyPENGU3RyaW5n UmVmPiBkYXRhQXNTdHJpbmcgPSBhZG9wdENGKENGU3RyaW5nQ3JlYXRlRnJvbUV4dGVybmFsUmVw cmVzZW50YXRpb24oa0NGQWxsb2NhdG9yRGVmYXVsdCwgZGF0YSwgc3RyaW5nRW5jb2RpbmcpKTsK ICAgICAgICAgaWYgKGRhdGFBc1N0cmluZykKICAgICAgICAgICAgIENGRGljdGlvbmFyeVNldFZh bHVlKHJlc291cmNlLCBDRlNUUigiV2ViUmVzb3VyY2VEYXRhIiksIGRhdGFBc1N0cmluZy5nZXQo KSk7CiAgICAgfQpAQCAtMTA5LDE3ICsxMDksMTcgQEAgc3RhdGljIHZvaWQgY29udmVydFdlYlJl c291cmNlUmVzcG9uc2VUb0RpY3Rpb25hcnkoQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiBwcm9wZXIK ICAgICBpZiAoQ0ZHZXRUeXBlSUQocmVzcG9uc2VEYXRhKSAhPSBDRkRhdGFHZXRUeXBlSUQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgUmV0YWluUHRyPENGVVJMUmVzcG9uc2VSZWY+IHJlc3Bv bnNlKEFkb3B0Q0YsIGNyZWF0ZUNGVVJMUmVzcG9uc2VGcm9tUmVzcG9uc2VEYXRhKHJlc3BvbnNl RGF0YSkpOworICAgIFJldGFpblB0cjxDRlVSTFJlc3BvbnNlUmVmPiByZXNwb25zZSA9IGFkb3B0 Q0YoY3JlYXRlQ0ZVUkxSZXNwb25zZUZyb21SZXNwb25zZURhdGEocmVzcG9uc2VEYXRhKSk7CiAg ICAgaWYgKCFyZXNwb25zZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmV0YWluUHRyPENGTXV0 YWJsZURpY3Rpb25hcnlSZWY+IHJlc3BvbnNlRGljdGlvbmFyeShBZG9wdENGLCBDRkRpY3Rpb25h cnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsICZrQ0ZUeXBlRGljdGlvbmFy eUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsKKyAgICBS ZXRhaW5QdHI8Q0ZNdXRhYmxlRGljdGlvbmFyeVJlZj4gcmVzcG9uc2VEaWN0aW9uYXJ5ID0gYWRv cHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsICZr Q0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxs QmFja3MpKTsKIAotICAgIFJldGFpblB0cjxDRk11dGFibGVTdHJpbmdSZWY+IHVybFN0cmluZyhB ZG9wdENGLCBDRlN0cmluZ0NyZWF0ZU11dGFibGVDb3B5KGtDRkFsbG9jYXRvckRlZmF1bHQsIDAs IENGVVJMR2V0U3RyaW5nKENGVVJMUmVzcG9uc2VHZXRVUkwocmVzcG9uc2UuZ2V0KCkpKSkpOwor ICAgIFJldGFpblB0cjxDRk11dGFibGVTdHJpbmdSZWY+IHVybFN0cmluZyA9IGFkb3B0Q0YoQ0ZT dHJpbmdDcmVhdGVNdXRhYmxlQ29weShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCBDRlVSTEdldFN0 cmluZyhDRlVSTFJlc3BvbnNlR2V0VVJMKHJlc3BvbnNlLmdldCgpKSkpKTsKICAgICBub3JtYWxp emVXZWJSZXNvdXJjZVVSTCh1cmxTdHJpbmcuZ2V0KCkpOwogICAgIENGRGljdGlvbmFyeVNldFZh bHVlKHJlc3BvbnNlRGljdGlvbmFyeS5nZXQoKSwgQ0ZTVFIoIlVSTCIpLCB1cmxTdHJpbmcuZ2V0 KCkpOwogCi0gICAgUmV0YWluUHRyPENGTXV0YWJsZVN0cmluZ1JlZj4gbWltZVR5cGVTdHJpbmco QWRvcHRDRiwgQ0ZTdHJpbmdDcmVhdGVNdXRhYmxlQ29weShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAw LCBDRlVSTFJlc3BvbnNlR2V0TUlNRVR5cGUocmVzcG9uc2UuZ2V0KCkpKSk7CisgICAgUmV0YWlu UHRyPENGTXV0YWJsZVN0cmluZ1JlZj4gbWltZVR5cGVTdHJpbmcgPSBhZG9wdENGKENGU3RyaW5n Q3JlYXRlTXV0YWJsZUNvcHkoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgQ0ZVUkxSZXNwb25zZUdl dE1JTUVUeXBlKHJlc3BvbnNlLmdldCgpKSkpOwogICAgIGNvbnZlcnRNSU1FVHlwZShtaW1lVHlw ZVN0cmluZy5nZXQoKSk7CiAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUocmVzcG9uc2VEaWN0aW9u YXJ5LmdldCgpLCBDRlNUUigiTUlNRVR5cGUiKSwgbWltZVR5cGVTdHJpbmcuZ2V0KCkpOwogCkBA IC0xMjgsMTcgKzEyOCwxNyBAQCBzdGF0aWMgdm9pZCBjb252ZXJ0V2ViUmVzb3VyY2VSZXNwb25z ZVRvRGljdGlvbmFyeShDRk11dGFibGVEaWN0aW9uYXJ5UmVmIHByb3BlcgogICAgICAgICBDRkRp Y3Rpb25hcnlTZXRWYWx1ZShyZXNwb25zZURpY3Rpb25hcnkuZ2V0KCksIENGU1RSKCJ0ZXh0RW5j b2RpbmdOYW1lIiksIHRleHRFbmNvZGluZ05hbWUpOwogCiAgICAgU0ludDY0IGV4cGVjdGVkQ29u dGVudExlbmd0aCA9IENGVVJMUmVzcG9uc2VHZXRFeHBlY3RlZENvbnRlbnRMZW5ndGgocmVzcG9u c2UuZ2V0KCkpOwotICAgIFJldGFpblB0cjxDRk51bWJlclJlZj4gZXhwZWN0ZWRDb250ZW50TGVu Z3RoTnVtYmVyKEFkb3B0Q0YsIENGTnVtYmVyQ3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGtD Rk51bWJlclNJbnQ2NFR5cGUsICZleHBlY3RlZENvbnRlbnRMZW5ndGgpKTsKKyAgICBSZXRhaW5Q dHI8Q0ZOdW1iZXJSZWY+IGV4cGVjdGVkQ29udGVudExlbmd0aE51bWJlciA9IGFkb3B0Q0YoQ0ZO dW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwga0NGTnVtYmVyU0ludDY0VHlwZSwgJmV4 cGVjdGVkQ29udGVudExlbmd0aCkpOwogICAgIENGRGljdGlvbmFyeVNldFZhbHVlKHJlc3BvbnNl RGljdGlvbmFyeS5nZXQoKSwgQ0ZTVFIoImV4cGVjdGVkQ29udGVudExlbmd0aCIpLCBleHBlY3Rl ZENvbnRlbnRMZW5ndGhOdW1iZXIuZ2V0KCkpOwogCiAgICAgaWYgKENGSFRUUE1lc3NhZ2VSZWYg aHR0cE1lc3NhZ2UgPSBDRlVSTFJlc3BvbnNlR2V0SFRUUFJlc3BvbnNlKHJlc3BvbnNlLmdldCgp KSkgewotICAgICAgICBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBhbGxIZWFkZXJzKEFkb3B0 Q0YsIENGSFRUUE1lc3NhZ2VDb3B5QWxsSGVhZGVyRmllbGRzKGh0dHBNZXNzYWdlKSk7Ci0gICAg ICAgIFJldGFpblB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVmPiBhbGxIZWFkZXJGaWVsZHMoQWRv cHRDRiwgQ0ZEaWN0aW9uYXJ5Q3JlYXRlTXV0YWJsZUNvcHkoa0NGQWxsb2NhdG9yRGVmYXVsdCwg MCwgYWxsSGVhZGVycy5nZXQoKSkpOworICAgICAgICBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVm PiBhbGxIZWFkZXJzID0gYWRvcHRDRihDRkhUVFBNZXNzYWdlQ29weUFsbEhlYWRlckZpZWxkcyho dHRwTWVzc2FnZSkpOworICAgICAgICBSZXRhaW5QdHI8Q0ZNdXRhYmxlRGljdGlvbmFyeVJlZj4g YWxsSGVhZGVyRmllbGRzID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlQ29weShr Q0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCBhbGxIZWFkZXJzLmdldCgpKSk7CiAgICAgICAgIG5vcm1h bGl6ZUhUVFBSZXNwb25zZUhlYWRlckZpZWxkcyhhbGxIZWFkZXJGaWVsZHMuZ2V0KCkpOwogICAg ICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShyZXNwb25zZURpY3Rpb25hcnkuZ2V0KCksIENGU1RS KCJhbGxIZWFkZXJGaWVsZHMiKSwgYWxsSGVhZGVyRmllbGRzLmdldCgpKTsKIAogICAgICAgICBD RkluZGV4IHN0YXR1c0NvZGUgPSBDRkhUVFBNZXNzYWdlR2V0UmVzcG9uc2VTdGF0dXNDb2RlKGh0 dHBNZXNzYWdlKTsKLSAgICAgICAgUmV0YWluUHRyPENGTnVtYmVyUmVmPiBzdGF0dXNDb2RlTnVt YmVyKEFkb3B0Q0YsIENGTnVtYmVyQ3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGtDRk51bWJl ckNGSW5kZXhUeXBlLCAmc3RhdHVzQ29kZSkpOworICAgICAgICBSZXRhaW5QdHI8Q0ZOdW1iZXJS ZWY+IHN0YXR1c0NvZGVOdW1iZXIgPSBhZG9wdENGKENGTnVtYmVyQ3JlYXRlKGtDRkFsbG9jYXRv ckRlZmF1bHQsIGtDRk51bWJlckNGSW5kZXhUeXBlLCAmc3RhdHVzQ29kZSkpOwogICAgICAgICBD RkRpY3Rpb25hcnlTZXRWYWx1ZShyZXNwb25zZURpY3Rpb25hcnkuZ2V0KCksIENGU1RSKCJzdGF0 dXNDb2RlIiksIHN0YXR1c0NvZGVOdW1iZXIuZ2V0KCkpOwogICAgIH0KIApAQCAtMTYwLDEyICsx NjAsMTIgQEAgQ0ZTdHJpbmdSZWYgY3JlYXRlWE1MU3RyaW5nRnJvbVdlYkFyY2hpdmVEYXRhKENG RGF0YVJlZiB3ZWJBcmNoaXZlRGF0YSkKIAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR VUlSRUQgPT0gMTA1MAogICAgIENGSW5kZXggYnl0ZXNDb3VudCA9IENGRGF0YUdldExlbmd0aCh3 ZWJBcmNoaXZlRGF0YSk7Ci0gICAgUmV0YWluUHRyPENGUmVhZFN0cmVhbVJlZj4gcmVhZFN0cmVh bShBZG9wdENGLCBDRlJlYWRTdHJlYW1DcmVhdGVXaXRoQnl0ZXNOb0NvcHkoa0NGQWxsb2NhdG9y RGVmYXVsdCwgQ0ZEYXRhR2V0Qnl0ZVB0cih3ZWJBcmNoaXZlRGF0YSksIGJ5dGVzQ291bnQsIGtD RkFsbG9jYXRvck51bGwpKTsKKyAgICBSZXRhaW5QdHI8Q0ZSZWFkU3RyZWFtUmVmPiByZWFkU3Ry ZWFtID0gYWRvcHRDRihDRlJlYWRTdHJlYW1DcmVhdGVXaXRoQnl0ZXNOb0NvcHkoa0NGQWxsb2Nh dG9yRGVmYXVsdCwgQ0ZEYXRhR2V0Qnl0ZVB0cih3ZWJBcmNoaXZlRGF0YSksIGJ5dGVzQ291bnQs IGtDRkFsbG9jYXRvck51bGwpKTsKICAgICBDRlJlYWRTdHJlYW1PcGVuKHJlYWRTdHJlYW0uZ2V0 KCkpOwotICAgIFJldGFpblB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVmPiBwcm9wZXJ0eUxpc3Qo QWRvcHRDRiwgKENGTXV0YWJsZURpY3Rpb25hcnlSZWYpQ0ZQcm9wZXJ0eUxpc3RDcmVhdGVGcm9t U3RyZWFtKGtDRkFsbG9jYXRvckRlZmF1bHQsIHJlYWRTdHJlYW0uZ2V0KCksIGJ5dGVzQ291bnQs IGtDRlByb3BlcnR5TGlzdE11dGFibGVDb250YWluZXJzQW5kTGVhdmVzLCAmZm9ybWF0LCAwKSk7 CisgICAgUmV0YWluUHRyPENGTXV0YWJsZURpY3Rpb25hcnlSZWY+IHByb3BlcnR5TGlzdCA9IGFk b3B0Q0YoKENGTXV0YWJsZURpY3Rpb25hcnlSZWYpQ0ZQcm9wZXJ0eUxpc3RDcmVhdGVGcm9tU3Ry ZWFtKGtDRkFsbG9jYXRvckRlZmF1bHQsIHJlYWRTdHJlYW0uZ2V0KCksIGJ5dGVzQ291bnQsIGtD RlByb3BlcnR5TGlzdE11dGFibGVDb250YWluZXJzQW5kTGVhdmVzLCAmZm9ybWF0LCAwKSk7CiAg ICAgQ0ZSZWFkU3RyZWFtQ2xvc2UocmVhZFN0cmVhbS5nZXQoKSk7CiAjZWxzZQotICAgIFJldGFp blB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVmPiBwcm9wZXJ0eUxpc3QoQWRvcHRDRiwgKENGTXV0 YWJsZURpY3Rpb25hcnlSZWYpQ0ZQcm9wZXJ0eUxpc3RDcmVhdGVXaXRoRGF0YShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCB3ZWJBcmNoaXZlRGF0YSwga0NGUHJvcGVydHlMaXN0TXV0YWJsZUNvbnRhaW5l cnNBbmRMZWF2ZXMsICZmb3JtYXQsICZlcnJvcikpOworICAgIFJldGFpblB0cjxDRk11dGFibGVE aWN0aW9uYXJ5UmVmPiBwcm9wZXJ0eUxpc3QgPSBhZG9wdENGKChDRk11dGFibGVEaWN0aW9uYXJ5 UmVmKUNGUHJvcGVydHlMaXN0Q3JlYXRlV2l0aERhdGEoa0NGQWxsb2NhdG9yRGVmYXVsdCwgd2Vi QXJjaGl2ZURhdGEsIGtDRlByb3BlcnR5TGlzdE11dGFibGVDb250YWluZXJzQW5kTGVhdmVzLCAm Zm9ybWF0LCAmZXJyb3IpKTsKICNlbmRpZgogCiAgICAgaWYgKCFwcm9wZXJ0eUxpc3QpIHsKQEAg LTE3NCw3ICsxNzQsNyBAQCBDRlN0cmluZ1JlZiBjcmVhdGVYTUxTdHJpbmdGcm9tV2ViQXJjaGl2 ZURhdGEoQ0ZEYXRhUmVmIHdlYkFyY2hpdmVEYXRhKQogICAgICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8Q0ZTdHJpbmdSZWY+KENGUmV0YWluKENGU1RSKCJBbiB1bmtub3duIGVycm9yIG9jY3VycmVk IGNvbnZlcnRpbmcgZGF0YSB0byBwcm9wZXJ0eSBsaXN0LiIpKSk7CiAgICAgfQogCi0gICAgUmV0 YWluUHRyPENGTXV0YWJsZUFycmF5UmVmPiByZXNvdXJjZXMoQWRvcHRDRiwgQ0ZBcnJheUNyZWF0 ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCwgJmtDRlR5cGVBcnJheUNhbGxCYWNrcykp OworICAgIFJldGFpblB0cjxDRk11dGFibGVBcnJheVJlZj4gcmVzb3VyY2VzID0gYWRvcHRDRihD RkFycmF5Q3JlYXRlTXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCAma0NGVHlwZUFycmF5 Q2FsbEJhY2tzKSk7CiAgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKHJlc291cmNlcy5nZXQoKSwgcHJv cGVydHlMaXN0LmdldCgpKTsKIAogICAgIHdoaWxlIChDRkFycmF5R2V0Q291bnQocmVzb3VyY2Vz LmdldCgpKSkgewpAQCAtMjA5LDkgKzIwOSw5IEBAIENGU3RyaW5nUmVmIGNyZWF0ZVhNTFN0cmlu Z0Zyb21XZWJBcmNoaXZlRGF0YShDRkRhdGFSZWYgd2ViQXJjaGl2ZURhdGEpCiAgICAgZXJyb3Ig PSAwOwogCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA9PSAxMDUwCi0gICAg UmV0YWluUHRyPENGRGF0YVJlZj4geG1sRGF0YShBZG9wdENGLCBDRlByb3BlcnR5TGlzdENyZWF0 ZVhNTERhdGEoa0NGQWxsb2NhdG9yRGVmYXVsdCwgcHJvcGVydHlMaXN0LmdldCgpKSk7CisgICAg UmV0YWluUHRyPENGRGF0YVJlZj4geG1sRGF0YSA9IGFkb3B0Q0YoQ0ZQcm9wZXJ0eUxpc3RDcmVh dGVYTUxEYXRhKGtDRkFsbG9jYXRvckRlZmF1bHQsIHByb3BlcnR5TGlzdC5nZXQoKSkpOwogI2Vs c2UKLSAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiB4bWxEYXRhKEFkb3B0Q0YsIENGUHJvcGVydHlM aXN0Q3JlYXRlRGF0YShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBwcm9wZXJ0eUxpc3QuZ2V0KCksIGtD RlByb3BlcnR5TGlzdFhNTEZvcm1hdF92MV8wLCAwLCAmZXJyb3IpKTsKKyAgICBSZXRhaW5QdHI8 Q0ZEYXRhUmVmPiB4bWxEYXRhID0gYWRvcHRDRihDRlByb3BlcnR5TGlzdENyZWF0ZURhdGEoa0NG QWxsb2NhdG9yRGVmYXVsdCwgcHJvcGVydHlMaXN0LmdldCgpLCBrQ0ZQcm9wZXJ0eUxpc3RYTUxG b3JtYXRfdjFfMCwgMCwgJmVycm9yKSk7CiAjZW5kaWYKIAogICAgIGlmICgheG1sRGF0YSkgewpA QCAtMjIwLDggKzIyMCw4IEBAIENGU3RyaW5nUmVmIGNyZWF0ZVhNTFN0cmluZ0Zyb21XZWJBcmNo aXZlRGF0YShDRkRhdGFSZWYgd2ViQXJjaGl2ZURhdGEpCiAgICAgICAgIHJldHVybiBzdGF0aWNf Y2FzdDxDRlN0cmluZ1JlZj4oQ0ZSZXRhaW4oQ0ZTVFIoIkFuIHVua25vd24gZXJyb3Igb2NjdXJy ZWQgY29udmVydGluZyBwcm9wZXJ0eSBsaXN0IHRvIGRhdGEuIikpKTsKICAgICB9CiAKLSAgICBS ZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHhtbFN0cmluZyhBZG9wdENGLCBDRlN0cmluZ0NyZWF0ZUZy b21FeHRlcm5hbFJlcHJlc2VudGF0aW9uKGtDRkFsbG9jYXRvckRlZmF1bHQsIHhtbERhdGEuZ2V0 KCksIGtDRlN0cmluZ0VuY29kaW5nVVRGOCkpOwotICAgIFJldGFpblB0cjxDRk11dGFibGVTdHJp bmdSZWY+IHN0cmluZyhBZG9wdENGLCBDRlN0cmluZ0NyZWF0ZU11dGFibGVDb3B5KGtDRkFsbG9j YXRvckRlZmF1bHQsIDAsIHhtbFN0cmluZy5nZXQoKSkpOworICAgIFJldGFpblB0cjxDRlN0cmlu Z1JlZj4geG1sU3RyaW5nID0gYWRvcHRDRihDRlN0cmluZ0NyZWF0ZUZyb21FeHRlcm5hbFJlcHJl c2VudGF0aW9uKGtDRkFsbG9jYXRvckRlZmF1bHQsIHhtbERhdGEuZ2V0KCksIGtDRlN0cmluZ0Vu Y29kaW5nVVRGOCkpOworICAgIFJldGFpblB0cjxDRk11dGFibGVTdHJpbmdSZWY+IHN0cmluZyA9 IGFkb3B0Q0YoQ0ZTdHJpbmdDcmVhdGVNdXRhYmxlQ29weShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAw LCB4bWxTdHJpbmcuZ2V0KCkpKTsKIAogICAgIC8vIFJlcGxhY2UgIkFwcGxlIENvbXB1dGVyIiB3 aXRoICJBcHBsZSIgaW4gdGhlIERURCBkZWNsYXJhdGlvbi4KICAgICBDRlN0cmluZ0ZpbmRBbmRS ZXBsYWNlKHN0cmluZy5nZXQoKSwgQ0ZTVFIoIi0vL0FwcGxlIENvbXB1dGVyLy8iKSwgQ0ZTVFIo Ii0vL0FwcGxlLy8iKSwgQ0ZSYW5nZU1ha2UoMCwgQ0ZTdHJpbmdHZXRMZW5ndGgoc3RyaW5nLmdl dCgpKSksIDApOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvV2ViQXJj aGl2ZUR1bXBTdXBwb3J0TWFjLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvV2ViQXJj aGl2ZUR1bXBTdXBwb3J0TWFjLm1tCmluZGV4IDlmOTRlY2JjNDBjOGZkNWJkNDNlYjNiZWM1MzFm OTVhMWE3N2I3ZjMuLmUwNmU3OTc1MGUzMjA5OWIwMmFiYmQ4YzAzMTk0NzM2OGJlOTFkZTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1dlYkFyY2hpdmVEdW1wU3VwcG9y dE1hYy5tbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9XZWJBcmNoaXZlRHVtcFN1 cHBvcnRNYWMubW0KQEAgLTUyLDcgKzUyLDcgQEAgdm9pZCBDRlVSTFJlc3BvbnNlU2V0TUlNRVR5 cGUoQ0ZVUkxSZXNwb25zZVJlZiByZXNwb25zZSwgQ0ZTdHJpbmdSZWYgbWltZVR5cGUpOwogQ0ZV UkxSZXNwb25zZVJlZiBjcmVhdGVDRlVSTFJlc3BvbnNlRnJvbVJlc3BvbnNlRGF0YShDRkRhdGFS ZWYgcmVzcG9uc2VEYXRhKQogewogICAgIC8vIERlY29kZSBOU1VSTFJlc3BvbnNlCi0gICAgUmV0 YWluUHRyPE5TS2V5ZWRVbmFyY2hpdmVyPiB1bmFyY2hpdmVyKEFkb3B0TlMsIFtbTlNLZXllZFVu YXJjaGl2ZXIgYWxsb2NdIGluaXRGb3JSZWFkaW5nV2l0aERhdGE6KE5TRGF0YSAqKXJlc3BvbnNl RGF0YV0pOworICAgIFJldGFpblB0cjxOU0tleWVkVW5hcmNoaXZlcj4gdW5hcmNoaXZlciA9IGFk b3B0TlMoW1tOU0tleWVkVW5hcmNoaXZlciBhbGxvY10gaW5pdEZvclJlYWRpbmdXaXRoRGF0YToo TlNEYXRhICopcmVzcG9uc2VEYXRhXSk7CiAgICAgTlNVUkxSZXNwb25zZSAqcmVzcG9uc2UgPSBb dW5hcmNoaXZlci5nZXQoKSBkZWNvZGVPYmplY3RGb3JLZXk6QCJXZWJSZXNvdXJjZVJlc3BvbnNl Il07IC8vIFdlYlJlc291cmNlUmVzcG9uc2VLZXkgaW4gV2ViUmVzb3VyY2UubQogICAgIFt1bmFy Y2hpdmVyLmdldCgpIGZpbmlzaERlY29kaW5nXTsKIApAQCAtNjIsNyArNjIsNyBAQCBDRlVSTFJl c3BvbnNlUmVmIGNyZWF0ZUNGVVJMUmVzcG9uc2VGcm9tUmVzcG9uc2VEYXRhKENGRGF0YVJlZiBy ZXNwb25zZURhdGEpCiAgICAgTlNIVFRQVVJMUmVzcG9uc2UgKmh0dHBSZXNwb25zZSA9IChOU0hU VFBVUkxSZXNwb25zZSAqKXJlc3BvbnNlOwogCiAgICAgLy8gTlNVUkxSZXNwb25zZSBpcyBub3Qg dG9sbC1mcmVlIGJyaWRnZWQgdG8gQ0ZVUkxSZXNwb25zZS4KLSAgICBSZXRhaW5QdHI8Q0ZIVFRQ TWVzc2FnZVJlZj4gaHR0cE1lc3NhZ2UoQWRvcHRDRiwgQ0ZIVFRQTWVzc2FnZUNyZWF0ZVJlc3Bv bnNlKGtDRkFsbG9jYXRvckRlZmF1bHQsIFtodHRwUmVzcG9uc2Ugc3RhdHVzQ29kZV0sIDAsIGtD RkhUVFBWZXJzaW9uMV8xKSk7CisgICAgUmV0YWluUHRyPENGSFRUUE1lc3NhZ2VSZWY+IGh0dHBN ZXNzYWdlID0gYWRvcHRDRihDRkhUVFBNZXNzYWdlQ3JlYXRlUmVzcG9uc2Uoa0NGQWxsb2NhdG9y RGVmYXVsdCwgW2h0dHBSZXNwb25zZSBzdGF0dXNDb2RlXSwgMCwga0NGSFRUUFZlcnNpb24xXzEp KTsKIAogICAgIE5TRGljdGlvbmFyeSAqaGVhZGVyRmllbGRzID0gW2h0dHBSZXNwb25zZSBhbGxI ZWFkZXJGaWVsZHNdOwogICAgIGZvciAoTlNTdHJpbmcgKmhlYWRlckZpZWxkIGluIFtoZWFkZXJG aWVsZHMga2V5RW51bWVyYXRvcl0pCg==