149256 2015-09-17 02:42:12 -0700 Block Objective-C exceptions in DictionaryLookup 2015-12-11 15:39:47 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bfulgham mitz simon.fraser oldest_to_newest 1126659 0 thorton 2015-09-17 02:42:12 -0700 Block Objective-C exceptions in DictionaryLookup 1126660 1 261382 thorton 2015-09-17 02:42:35 -0700 Created attachment 261382 Patch 1126662 2 261383 thorton 2015-09-17 02:47:08 -0700 Created attachment 261383 Patch 1126923 3 thorton 2015-09-17 16:23:26 -0700 http://trac.webkit.org/changeset/189942 1148574 4 bfulgham 2015-12-11 15:39:47 -0800 <rdar://problem/22577770> 261382 2015-09-17 02:42:35 -0700 2015-09-17 02:47:05 -0700 Patch bug-149256-20150917024223.patch text/plain 5506 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5OTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2I4YjQ2YjdmNTI2OTdi MWViYTQ3YmYwZjk3YWVkNjVjNjhhOTVlMy4uMDBlOGUzZTJkZWM5YzUyMzk4YTczNzk3OWQ5MWE1 ZGI1MDhlNmM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA5LTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEJsb2NrIE9iamVj dGl2ZS1DIGV4Y2VwdGlvbnMgaW4gRGljdGlvbmFyeUxvb2t1cAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5MjU2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9v a3VwLm1tOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeUxvb2t1cDo6cmFuZ2VGb3JTZWxl Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeUxvb2t1cDo6cmFuZ2VBdEhpdFRl c3RSZXN1bHQpOgorICAgICAgICAoV2ViQ29yZTo6ZXhwYW5kU2VsZWN0aW9uQnlDaGFyYWN0ZXJz KToKKyAgICAgICAgKFdlYkNvcmU6OkRpY3Rpb25hcnlMb29rdXA6OnN0cmluZ0ZvclBERlNlbGVj dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzaG93UG9wdXBPckNyZWF0ZUFuaW1hdGlvbkNvbnRy b2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeUxvb2t1cDo6aGlkZVBvcHVwKToK KyAgICAgICAgSXQgaXMgcG9zc2libGUgZm9yIExvb2t1cCB0byB0aHJvdyBhbiBleGNlcHRpb24g aWYgb25lIG9mIGl0cworICAgICAgICByZWxhdGVkIHNlcnZpY2VzIGRpZXMgZm9yIHNvbWUgcmVh c29uLiBUaGlzIHNob3VsZG4ndCB0YWtlIGRvd24KKyAgICAgICAgb3VyIFVJIHByb2Nlc3MsIHNv IGJsb2NrIHRoZSBleGNlcHRpb25zLgorCiAyMDE1LTA5LTE3ICBKYXZpZXIgRmVybmFuZGV6ICA8 amZlcm5hbmRlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFJlbGF5 b3V0IHdoZW5ldmVyIEJveCBBbGlnbm1lbnQgcHJvcGVydGllcyBjaGFuZ2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0RpY3Rpb25hcnlMb29rdXAubW0gYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9va3VwLm1tCmluZGV4IGYzMjAwY2JmMTJi N2IwNGE0ZmYwZWU3MjFmZDJhZGI2MjhjNjg4MGEuLjUxOWVkZjNkMmEzNzMyMDdlZjRmOWZjMjc1 NDlhNmI2MjY3ZmZhMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0Rp Y3Rpb25hcnlMb29rdXAubW0KKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRGljdGlv bmFyeUxvb2t1cC5tbQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgUExBVEZPUk0oTUFDKQogCisj aW1wb3J0ICJCbG9ja0V4Y2VwdGlvbnMuaCIKICNpbXBvcnQgIkRvY3VtZW50LmgiCiAjaW1wb3J0 ICJGb2N1c0NvbnRyb2xsZXIuaCIKICNpbXBvcnQgIkZyYW1lLmgiCkBAIC04Myw5ICs4NCwxMSBA QCBQYXNzUmVmUHRyPFJhbmdlPiBEaWN0aW9uYXJ5TG9va3VwOjpyYW5nZUZvclNlbGVjdGlvbihj b25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZQogCiAgICAgU3RyaW5nIGZ1bGxQbGFpblRleHRTdHJp bmcgPSBwbGFpblRleHQobWFrZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBwYXJhZ3JhcGhFbmQpLmdl dCgpKTsKIAorICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKICAgICAvLyBTaW5jZSB3 ZSBhbHJlYWR5IGhhdmUgdGhlIHJhbmdlIHdlIHdhbnQsIHdlIGp1c3QgbmVlZCB0byBncmFiIHRo ZSByZXR1cm5lZCBvcHRpb25zLgogICAgIGlmIChDbGFzcyBsdUxvb2t1cERlZmluaXRpb25Nb2R1 bGUgPSBnZXRMVUxvb2t1cERlZmluaXRpb25Nb2R1bGVDbGFzcygpKQogICAgICAgICBbbHVMb29r dXBEZWZpbml0aW9uTW9kdWxlIHRva2VuUmFuZ2VGb3JTdHJpbmc6ZnVsbFBsYWluVGV4dFN0cmlu ZyByYW5nZTpyYW5nZVRvUGFzcyBvcHRpb25zOm9wdGlvbnNdOworICAgIEVORF9CTE9DS19PQkpD X0VYQ0VQVElPTlM7CiAKICAgICByZXR1cm4gc2VsZWN0ZWRSYW5nZS5yZWxlYXNlKCk7CiB9CkBA IC0xMjcsNiArMTMwLDggQEAgUGFzc1JlZlB0cjxSYW5nZT4gRGljdGlvbmFyeUxvb2t1cDo6cmFu Z2VBdEhpdFRlc3RSZXN1bHQoY29uc3QgSGl0VGVzdFJlc3VsdCYgaGkKICAgICBpZiAoIWZ1bGxD aGFyYWN0ZXJSYW5nZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKKyAgICBCRUdJTl9CTE9D S19PQkpDX0VYQ0VQVElPTlM7CisKICAgICBOU1JhbmdlIHJhbmdlVG9QYXNzID0gTlNNYWtlUmFu Z2UoVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UoZnVsbENoYXJhY3RlclJhbmdl LT5zdGFydFBvc2l0aW9uKCksIHBvc2l0aW9uKS5nZXQoKSksIDApOwogCiAgICAgU3RyaW5nIGZ1 bGxQbGFpblRleHRTdHJpbmcgPSBwbGFpblRleHQoZnVsbENoYXJhY3RlclJhbmdlLmdldCgpKTsK QEAgLTE0MCwxMCArMTQ1LDE0IEBAIFBhc3NSZWZQdHI8UmFuZ2U+IERpY3Rpb25hcnlMb29rdXA6 OnJhbmdlQXRIaXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RSZXN1bHQmIGhpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwogCiAgICAgcmV0dXJuIFRleHRJdGVyYXRvcjo6c3VicmFuZ2UoZnVsbENo YXJhY3RlclJhbmdlLmdldCgpLCBleHRyYWN0ZWRSYW5nZS5sb2NhdGlvbiwgZXh0cmFjdGVkUmFu Z2UubGVuZ3RoKTsKKworICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiB9CiAKIHN0YXRp YyB2b2lkIGV4cGFuZFNlbGVjdGlvbkJ5Q2hhcmFjdGVycyhQREZTZWxlY3Rpb24gKnNlbGVjdGlv biwgTlNJbnRlZ2VyIG51bWJlck9mQ2hhcmFjdGVyc1RvRXhwYW5kLCBOU0ludGVnZXImIGNoYXJh Y3RlcnNBZGRlZEJlZm9yZVN0YXJ0LCBOU0ludGVnZXImIGNoYXJhY3RlcnNBZGRlZEFmdGVyRW5k KQogeworICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKwogICAgIHNpemVfdCBvcmln aW5hbExlbmd0aCA9IHNlbGVjdGlvbi5zdHJpbmcubGVuZ3RoOwogICAgIFtzZWxlY3Rpb24gZXh0 ZW5kU2VsZWN0aW9uQXRTdGFydDpudW1iZXJPZkNoYXJhY3RlcnNUb0V4cGFuZF07CiAgICAgCkBA IC0xNTEsMTAgKzE2MCwxNCBAQCBzdGF0aWMgdm9pZCBleHBhbmRTZWxlY3Rpb25CeUNoYXJhY3Rl cnMoUERGU2VsZWN0aW9uICpzZWxlY3Rpb24sIE5TSW50ZWdlciBudW1iZQogICAgIAogICAgIFtz ZWxlY3Rpb24gZXh0ZW5kU2VsZWN0aW9uQXRFbmQ6bnVtYmVyT2ZDaGFyYWN0ZXJzVG9FeHBhbmRd OwogICAgIGNoYXJhY3RlcnNBZGRlZEFmdGVyRW5kID0gc2VsZWN0aW9uLnN0cmluZy5sZW5ndGgg LSBvcmlnaW5hbExlbmd0aCAtIGNoYXJhY3RlcnNBZGRlZEJlZm9yZVN0YXJ0OworCisgICAgRU5E X0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIH0KIAogTlNTdHJpbmcgKkRpY3Rpb25hcnlMb29rdXA6 OnN0cmluZ0ZvclBERlNlbGVjdGlvbihQREZTZWxlY3Rpb24gKnNlbGVjdGlvbiwgTlNEaWN0aW9u YXJ5ICoqb3B0aW9ucykKIHsKKyAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisKICAg ICAvLyBEb24ndCBkbyBhbnl0aGluZyBpZiB0aGVyZSBpcyBubyBjaGFyYWN0ZXIgYXQgdGhlIHBv aW50LgogICAgIGlmICghc2VsZWN0aW9uIHx8ICFzZWxlY3Rpb24uc3RyaW5nLmxlbmd0aCkKICAg ICAgICAgcmV0dXJuIEAiIjsKQEAgLTE4NiwxMCArMTk5LDE0IEBAIE5TU3RyaW5nICpEaWN0aW9u YXJ5TG9va3VwOjpzdHJpbmdGb3JQREZTZWxlY3Rpb24oUERGU2VsZWN0aW9uICpzZWxlY3Rpb24s IE5TRGljCiAgICAgCiAgICAgQVNTRVJUKFtzZWxlY3Rpb24uc3RyaW5nIGlzRXF1YWxUb1N0cmlu ZzpbZnVsbFBsYWluVGV4dFN0cmluZyBzdWJzdHJpbmdXaXRoUmFuZ2U6ZXh0cmFjdGVkUmFuZ2Vd XSk7CiAgICAgcmV0dXJuIHNlbGVjdGlvbi5zdHJpbmc7CisKKyAgICBFTkRfQkxPQ0tfT0JKQ19F WENFUFRJT05TOwogfQogCiBzdGF0aWMgUGxhdGZvcm1BbmltYXRpb25Db250cm9sbGVyIHNob3dQ b3B1cE9yQ3JlYXRlQW5pbWF0aW9uQ29udHJvbGxlcihib29sIGNyZWF0ZUFuaW1hdGlvbkNvbnRy b2xsZXIsIGNvbnN0IERpY3Rpb25hcnlQb3B1cEluZm8mIGRpY3Rpb25hcnlQb3B1cEluZm8sIE5T VmlldyAqdmlldywgc3RkOjpmdW5jdGlvbjx2b2lkKFRleHRJbmRpY2F0b3ImKT4gdGV4dEluZGlj YXRvckluc3RhbGxhdGlvbkNhbGxiYWNrKQogeworICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBU SU9OUzsKKwogICAgIGlmICghZ2V0TFVMb29rdXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MoKSkKICAg ICAgICAgcmV0dXJuIG5pbDsKIApAQCAtMjMyLDYgKzI0OSw4IEBAIHN0YXRpYyBQbGF0Zm9ybUFu aW1hdGlvbkNvbnRyb2xsZXIgc2hvd1BvcHVwT3JDcmVhdGVBbmltYXRpb25Db250cm9sbGVyKGJv b2wgY3JlCiAKICAgICBbZ2V0TFVMb29rdXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MoKSBzaG93RGVm aW5pdGlvbkZvclRlcm06ZGljdGlvbmFyeVBvcHVwSW5mby5hdHRyaWJ1dGVkU3RyaW5nLmdldCgp IGF0TG9jYXRpb246dGV4dEJhc2VsaW5lT3JpZ2luIG9wdGlvbnM6bXV0YWJsZU9wdGlvbnMuZ2V0 KCldOwogICAgIHJldHVybiBuaWw7CisKKyAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwog fQogCiB2b2lkIERpY3Rpb25hcnlMb29rdXA6OnNob3dQb3B1cChjb25zdCBEaWN0aW9uYXJ5UG9w dXBJbmZvJiBkaWN0aW9uYXJ5UG9wdXBJbmZvLCBOU1ZpZXcgKnZpZXcsIHN0ZDo6ZnVuY3Rpb248 dm9pZChUZXh0SW5kaWNhdG9yJik+IHRleHRJbmRpY2F0b3JJbnN0YWxsYXRpb25DYWxsYmFjaykK QEAgLTI0MSw5ICsyNjAsMTMgQEAgdm9pZCBEaWN0aW9uYXJ5TG9va3VwOjpzaG93UG9wdXAoY29u c3QgRGljdGlvbmFyeVBvcHVwSW5mbyYgZGljdGlvbmFyeVBvcHVwSW5mbywKIAogdm9pZCBEaWN0 aW9uYXJ5TG9va3VwOjpoaWRlUG9wdXAoKQogeworICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBU SU9OUzsKKwogICAgIGlmICghZ2V0TFVMb29rdXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MoKSkKICAg ICAgICAgcmV0dXJuOwogICAgIFtnZXRMVUxvb2t1cERlZmluaXRpb25Nb2R1bGVDbGFzcygpIGhp ZGVEZWZpbml0aW9uXTsKKworICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiB9CiAKIFBs YXRmb3JtQW5pbWF0aW9uQ29udHJvbGxlciBEaWN0aW9uYXJ5TG9va3VwOjphbmltYXRpb25Db250 cm9sbGVyRm9yUG9wdXAoY29uc3QgRGljdGlvbmFyeVBvcHVwSW5mbyYgZGljdGlvbmFyeVBvcHVw SW5mbywgTlNWaWV3ICp2aWV3LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoVGV4dEluZGljYXRvciYpPiB0 ZXh0SW5kaWNhdG9ySW5zdGFsbGF0aW9uQ2FsbGJhY2spCg== 261383 2015-09-17 02:47:08 -0700 2015-09-17 15:15:06 -0700 Patch bug-149256-20150917024656.patch text/plain 5561 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5OTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2I4YjQ2YjdmNTI2OTdi MWViYTQ3YmYwZjk3YWVkNjVjNjhhOTVlMy4uMDBlOGUzZTJkZWM5YzUyMzk4YTczNzk3OWQ5MWE1 ZGI1MDhlNmM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA5LTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEJsb2NrIE9iamVj dGl2ZS1DIGV4Y2VwdGlvbnMgaW4gRGljdGlvbmFyeUxvb2t1cAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5MjU2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9v a3VwLm1tOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeUxvb2t1cDo6cmFuZ2VGb3JTZWxl Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeUxvb2t1cDo6cmFuZ2VBdEhpdFRl c3RSZXN1bHQpOgorICAgICAgICAoV2ViQ29yZTo6ZXhwYW5kU2VsZWN0aW9uQnlDaGFyYWN0ZXJz KToKKyAgICAgICAgKFdlYkNvcmU6OkRpY3Rpb25hcnlMb29rdXA6OnN0cmluZ0ZvclBERlNlbGVj dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzaG93UG9wdXBPckNyZWF0ZUFuaW1hdGlvbkNvbnRy b2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeUxvb2t1cDo6aGlkZVBvcHVwKToK KyAgICAgICAgSXQgaXMgcG9zc2libGUgZm9yIExvb2t1cCB0byB0aHJvdyBhbiBleGNlcHRpb24g aWYgb25lIG9mIGl0cworICAgICAgICByZWxhdGVkIHNlcnZpY2VzIGRpZXMgZm9yIHNvbWUgcmVh c29uLiBUaGlzIHNob3VsZG4ndCB0YWtlIGRvd24KKyAgICAgICAgb3VyIFVJIHByb2Nlc3MsIHNv IGJsb2NrIHRoZSBleGNlcHRpb25zLgorCiAyMDE1LTA5LTE3ICBKYXZpZXIgRmVybmFuZGV6ICA8 amZlcm5hbmRlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFJlbGF5 b3V0IHdoZW5ldmVyIEJveCBBbGlnbm1lbnQgcHJvcGVydGllcyBjaGFuZ2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0RpY3Rpb25hcnlMb29rdXAubW0gYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9va3VwLm1tCmluZGV4IGYzMjAwY2JmMTJi N2IwNGE0ZmYwZWU3MjFmZDJhZGI2MjhjNjg4MGEuLjAxNzYwYWJkNzEyZGRkMzViZTRiOGU4MDhh MTFlOTYyZGY4YzNkZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0Rp Y3Rpb25hcnlMb29rdXAubW0KKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRGljdGlv bmFyeUxvb2t1cC5tbQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgUExBVEZPUk0oTUFDKQogCisj aW1wb3J0ICJCbG9ja0V4Y2VwdGlvbnMuaCIKICNpbXBvcnQgIkRvY3VtZW50LmgiCiAjaW1wb3J0 ICJGb2N1c0NvbnRyb2xsZXIuaCIKICNpbXBvcnQgIkZyYW1lLmgiCkBAIC04Myw5ICs4NCwxMSBA QCBQYXNzUmVmUHRyPFJhbmdlPiBEaWN0aW9uYXJ5TG9va3VwOjpyYW5nZUZvclNlbGVjdGlvbihj b25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZQogCiAgICAgU3RyaW5nIGZ1bGxQbGFpblRleHRTdHJp bmcgPSBwbGFpblRleHQobWFrZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBwYXJhZ3JhcGhFbmQpLmdl dCgpKTsKIAorICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKICAgICAvLyBTaW5jZSB3 ZSBhbHJlYWR5IGhhdmUgdGhlIHJhbmdlIHdlIHdhbnQsIHdlIGp1c3QgbmVlZCB0byBncmFiIHRo ZSByZXR1cm5lZCBvcHRpb25zLgogICAgIGlmIChDbGFzcyBsdUxvb2t1cERlZmluaXRpb25Nb2R1 bGUgPSBnZXRMVUxvb2t1cERlZmluaXRpb25Nb2R1bGVDbGFzcygpKQogICAgICAgICBbbHVMb29r dXBEZWZpbml0aW9uTW9kdWxlIHRva2VuUmFuZ2VGb3JTdHJpbmc6ZnVsbFBsYWluVGV4dFN0cmlu ZyByYW5nZTpyYW5nZVRvUGFzcyBvcHRpb25zOm9wdGlvbnNdOworICAgIEVORF9CTE9DS19PQkpD X0VYQ0VQVElPTlM7CiAKICAgICByZXR1cm4gc2VsZWN0ZWRSYW5nZS5yZWxlYXNlKCk7CiB9CkBA IC0xMjcsNiArMTMwLDggQEAgUGFzc1JlZlB0cjxSYW5nZT4gRGljdGlvbmFyeUxvb2t1cDo6cmFu Z2VBdEhpdFRlc3RSZXN1bHQoY29uc3QgSGl0VGVzdFJlc3VsdCYgaGkKICAgICBpZiAoIWZ1bGxD aGFyYWN0ZXJSYW5nZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKKyAgICBCRUdJTl9CTE9D S19PQkpDX0VYQ0VQVElPTlM7CisKICAgICBOU1JhbmdlIHJhbmdlVG9QYXNzID0gTlNNYWtlUmFu Z2UoVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UoZnVsbENoYXJhY3RlclJhbmdl LT5zdGFydFBvc2l0aW9uKCksIHBvc2l0aW9uKS5nZXQoKSksIDApOwogCiAgICAgU3RyaW5nIGZ1 bGxQbGFpblRleHRTdHJpbmcgPSBwbGFpblRleHQoZnVsbENoYXJhY3RlclJhbmdlLmdldCgpKTsK QEAgLTE0MCwxMCArMTQ1LDE1IEBAIFBhc3NSZWZQdHI8UmFuZ2U+IERpY3Rpb25hcnlMb29rdXA6 OnJhbmdlQXRIaXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RSZXN1bHQmIGhpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwogCiAgICAgcmV0dXJuIFRleHRJdGVyYXRvcjo6c3VicmFuZ2UoZnVsbENo YXJhY3RlclJhbmdlLmdldCgpLCBleHRyYWN0ZWRSYW5nZS5sb2NhdGlvbiwgZXh0cmFjdGVkUmFu Z2UubGVuZ3RoKTsKKworICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAgcmV0dXJu IG51bGxwdHI7CiB9CiAKIHN0YXRpYyB2b2lkIGV4cGFuZFNlbGVjdGlvbkJ5Q2hhcmFjdGVycyhQ REZTZWxlY3Rpb24gKnNlbGVjdGlvbiwgTlNJbnRlZ2VyIG51bWJlck9mQ2hhcmFjdGVyc1RvRXhw YW5kLCBOU0ludGVnZXImIGNoYXJhY3RlcnNBZGRlZEJlZm9yZVN0YXJ0LCBOU0ludGVnZXImIGNo YXJhY3RlcnNBZGRlZEFmdGVyRW5kKQogeworICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9O UzsKKwogICAgIHNpemVfdCBvcmlnaW5hbExlbmd0aCA9IHNlbGVjdGlvbi5zdHJpbmcubGVuZ3Ro OwogICAgIFtzZWxlY3Rpb24gZXh0ZW5kU2VsZWN0aW9uQXRTdGFydDpudW1iZXJPZkNoYXJhY3Rl cnNUb0V4cGFuZF07CiAgICAgCkBAIC0xNTEsMTAgKzE2MSwxNCBAQCBzdGF0aWMgdm9pZCBleHBh bmRTZWxlY3Rpb25CeUNoYXJhY3RlcnMoUERGU2VsZWN0aW9uICpzZWxlY3Rpb24sIE5TSW50ZWdl ciBudW1iZQogICAgIAogICAgIFtzZWxlY3Rpb24gZXh0ZW5kU2VsZWN0aW9uQXRFbmQ6bnVtYmVy T2ZDaGFyYWN0ZXJzVG9FeHBhbmRdOwogICAgIGNoYXJhY3RlcnNBZGRlZEFmdGVyRW5kID0gc2Vs ZWN0aW9uLnN0cmluZy5sZW5ndGggLSBvcmlnaW5hbExlbmd0aCAtIGNoYXJhY3RlcnNBZGRlZEJl Zm9yZVN0YXJ0OworCisgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIH0KIAogTlNTdHJp bmcgKkRpY3Rpb25hcnlMb29rdXA6OnN0cmluZ0ZvclBERlNlbGVjdGlvbihQREZTZWxlY3Rpb24g KnNlbGVjdGlvbiwgTlNEaWN0aW9uYXJ5ICoqb3B0aW9ucykKIHsKKyAgICBCRUdJTl9CTE9DS19P QkpDX0VYQ0VQVElPTlM7CisKICAgICAvLyBEb24ndCBkbyBhbnl0aGluZyBpZiB0aGVyZSBpcyBu byBjaGFyYWN0ZXIgYXQgdGhlIHBvaW50LgogICAgIGlmICghc2VsZWN0aW9uIHx8ICFzZWxlY3Rp b24uc3RyaW5nLmxlbmd0aCkKICAgICAgICAgcmV0dXJuIEAiIjsKQEAgLTE4NiwxMCArMjAwLDE1 IEBAIE5TU3RyaW5nICpEaWN0aW9uYXJ5TG9va3VwOjpzdHJpbmdGb3JQREZTZWxlY3Rpb24oUERG U2VsZWN0aW9uICpzZWxlY3Rpb24sIE5TRGljCiAgICAgCiAgICAgQVNTRVJUKFtzZWxlY3Rpb24u c3RyaW5nIGlzRXF1YWxUb1N0cmluZzpbZnVsbFBsYWluVGV4dFN0cmluZyBzdWJzdHJpbmdXaXRo UmFuZ2U6ZXh0cmFjdGVkUmFuZ2VdXSk7CiAgICAgcmV0dXJuIHNlbGVjdGlvbi5zdHJpbmc7CisK KyAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOworICAgIHJldHVybiBuaWw7CiB9CiAKIHN0 YXRpYyBQbGF0Zm9ybUFuaW1hdGlvbkNvbnRyb2xsZXIgc2hvd1BvcHVwT3JDcmVhdGVBbmltYXRp b25Db250cm9sbGVyKGJvb2wgY3JlYXRlQW5pbWF0aW9uQ29udHJvbGxlciwgY29uc3QgRGljdGlv bmFyeVBvcHVwSW5mbyYgZGljdGlvbmFyeVBvcHVwSW5mbywgTlNWaWV3ICp2aWV3LCBzdGQ6OmZ1 bmN0aW9uPHZvaWQoVGV4dEluZGljYXRvciYpPiB0ZXh0SW5kaWNhdG9ySW5zdGFsbGF0aW9uQ2Fs bGJhY2spCiB7CisgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOworCiAgICAgaWYgKCFn ZXRMVUxvb2t1cERlZmluaXRpb25Nb2R1bGVDbGFzcygpKQogICAgICAgICByZXR1cm4gbmlsOwog CkBAIC0yMzIsNiArMjUxLDkgQEAgc3RhdGljIFBsYXRmb3JtQW5pbWF0aW9uQ29udHJvbGxlciBz aG93UG9wdXBPckNyZWF0ZUFuaW1hdGlvbkNvbnRyb2xsZXIoYm9vbCBjcmUKIAogICAgIFtnZXRM VUxvb2t1cERlZmluaXRpb25Nb2R1bGVDbGFzcygpIHNob3dEZWZpbml0aW9uRm9yVGVybTpkaWN0 aW9uYXJ5UG9wdXBJbmZvLmF0dHJpYnV0ZWRTdHJpbmcuZ2V0KCkgYXRMb2NhdGlvbjp0ZXh0QmFz ZWxpbmVPcmlnaW4gb3B0aW9uczptdXRhYmxlT3B0aW9ucy5nZXQoKV07CiAgICAgcmV0dXJuIG5p bDsKKworICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAgcmV0dXJuIG5pbDsKIH0K IAogdm9pZCBEaWN0aW9uYXJ5TG9va3VwOjpzaG93UG9wdXAoY29uc3QgRGljdGlvbmFyeVBvcHVw SW5mbyYgZGljdGlvbmFyeVBvcHVwSW5mbywgTlNWaWV3ICp2aWV3LCBzdGQ6OmZ1bmN0aW9uPHZv aWQoVGV4dEluZGljYXRvciYpPiB0ZXh0SW5kaWNhdG9ySW5zdGFsbGF0aW9uQ2FsbGJhY2spCkBA IC0yNDEsOSArMjYzLDEzIEBAIHZvaWQgRGljdGlvbmFyeUxvb2t1cDo6c2hvd1BvcHVwKGNvbnN0 IERpY3Rpb25hcnlQb3B1cEluZm8mIGRpY3Rpb25hcnlQb3B1cEluZm8sCiAKIHZvaWQgRGljdGlv bmFyeUxvb2t1cDo6aGlkZVBvcHVwKCkKIHsKKyAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElP TlM7CisKICAgICBpZiAoIWdldExVTG9va3VwRGVmaW5pdGlvbk1vZHVsZUNsYXNzKCkpCiAgICAg ICAgIHJldHVybjsKICAgICBbZ2V0TFVMb29rdXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MoKSBoaWRl RGVmaW5pdGlvbl07CisKKyAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogfQogCiBQbGF0 Zm9ybUFuaW1hdGlvbkNvbnRyb2xsZXIgRGljdGlvbmFyeUxvb2t1cDo6YW5pbWF0aW9uQ29udHJv bGxlckZvclBvcHVwKGNvbnN0IERpY3Rpb25hcnlQb3B1cEluZm8mIGRpY3Rpb25hcnlQb3B1cElu Zm8sIE5TVmlldyAqdmlldywgc3RkOjpmdW5jdGlvbjx2b2lkKFRleHRJbmRpY2F0b3ImKT4gdGV4 dEluZGljYXRvckluc3RhbGxhdGlvbkNhbGxiYWNrKQo=