124377 2013-11-14 13:08:54 -0800 Stop using deprecated NSPropertyListSerialization methods 2013-11-14 13:13:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 950809 0 andersca 2013-11-14 13:08:54 -0800 Stop using deprecated NSPropertyListSerialization methods 950810 1 216970 andersca 2013-11-14 13:09:30 -0800 Created attachment 216970 Patch 950811 2 andersca 2013-11-14 13:13:05 -0800 Committed r159305: <http://trac.webkit.org/changeset/159305> 216970 2013-11-14 13:09:30 -0800 2013-11-14 13:11:33 -0800 Patch bug-124377-20131114130929.patch text/plain 11672 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMDNhZmUyYTky M2E0MWVhNDY1ZGNlNWNhNGI0ZmIzYjc4MzY0OTQ1MC4uODQ3Y2E3ODJkZTIzYTlmOWIyMjc2Yjky ZGYyMDNkYjRiNThlMTRkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEz LTExLTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U3RvcCB1c2luZyBkZXByZWNhdGVkIE5TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBtZXRob2Rz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQzNzcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEhpc3Rv cnkvV2ViSGlzdG9yeS5tbToKKyAgICAgICAgKC1bV2ViSGlzdG9yeVByaXZhdGUgbG9hZEhpc3Rv cnlHdXRzRnJvbVVSTDpzYXZlZEl0ZW1zQ291bnQ6Y29sbGVjdERpc2NhcmRlZEl0ZW1zSW50bzpl cnJvcjpdKToKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5h Z2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyOjpzcGF3 blBsdWdpbkhvc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2Vy OjppbnN0YW50aWF0ZVBsdWdpbik6CisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQ bHVnaW5Ib3N0UHJveHkubW06CisgICAgICAgIChXS1BDSWRlbnRpZmllckluZm8pOgorICAgICAg ICAqIFBsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eS5tbToKKyAgICAg ICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjplbnVtZXJhdGUpOgorICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6Om1hcnNoYWxWYWx1ZSk6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6bWFyc2hhbFZh bHVlcyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6ZGVt YXJzaGFsVmFsdWUpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJv eHk6OmRlbWFyc2hhbFZhbHVlcyk6CisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvUHJveHlJbnN0 YW5jZS5tbToKKyAgICAgICAgKFdlYktpdDo6UHJveHlJbnN0YW5jZTo6Z2V0UHJvcGVydHlOYW1l cyk6CisKIDIwMTMtMTEtMTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIHJvbGxvdXQgb2YgcjE1OTI3MSwgYnJva2UgTW91bnRhaW4g TGlvbiBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlz dG9yeS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeS5tbQppbmRleCA0 YjY1OTU3OTQ2YjM5ZDI5ZTk2ODExMjE1MDY1ODhlYmM5YjRiMzFkLi4yZDMxOGFjMGUwNGZjYjQ1 NDNlYjQ1YjgzMWE1ZDY0ZTI2ODdmZmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9I aXN0b3J5L1dlYkhpc3RvcnkubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJI aXN0b3J5Lm1tCkBAIC01MzgsMTIgKzUzOCw4IEBAIHN0YXRpYyBpbmxpbmUgV2ViSGlzdG9yeURh dGVLZXkgZGF0ZUtleShOU1RpbWVJbnRlcnZhbCBkYXRlKQogICAgICAgICB9CiAgICAgfSBlbHNl IHsKICAgICAgICAgTlNEYXRhICpkYXRhID0gW05TVVJMQ29ubmVjdGlvbiBzZW5kU3luY2hyb25v dXNSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6VVJMXSByZXR1cm5pbmdSZXNw b25zZTpuaWwgZXJyb3I6ZXJyb3JdOwotICAgICAgICBpZiAoZGF0YSAmJiBbZGF0YSBsZW5ndGhd ID4gMCkgewotICAgICAgICAgICAgZGljdGlvbmFyeSA9IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6 YXRpb24gcHJvcGVydHlMaXN0RnJvbURhdGE6ZGF0YQotICAgICAgICAgICAgICAgIG11dGFiaWxp dHlPcHRpb246TlNQcm9wZXJ0eUxpc3RJbW11dGFibGUKLSAgICAgICAgICAgICAgICBmb3JtYXQ6 bmlsCi0gICAgICAgICAgICAgICAgZXJyb3JEZXNjcmlwdGlvbjpuaWxdOwotICAgICAgICB9Cisg ICAgICAgIGlmIChkYXRhLmxlbmd0aCkKKyAgICAgICAgICAgIGRpY3Rpb25hcnkgPSBbTlNQcm9w ZXJ0eUxpc3RTZXJpYWxpemF0aW9uIHByb3BlcnR5TGlzdFdpdGhEYXRhOmRhdGEgb3B0aW9uczpO U1Byb3BlcnR5TGlzdEltbXV0YWJsZSBmb3JtYXQ6bnVsbHB0ciBlcnJvcjpudWxscHRyXTsKICAg ICB9CiAKICAgICAvLyBXZSB1c2VkIHRvIHN1cHBvcnQgTlNBcnJheXMgaGVyZSwgYnV0IHRoYXQg d2FzIGJlZm9yZSBTYWZhcmkgMS4wIHNoaXBwZWQuIFdlIHdpbGwgbm8gbG9uZ2VyIHN1cHBvcnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1 Z2luSG9zdE1hbmFnZXIubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRz Y2FwZVBsdWdpbkhvc3RNYW5hZ2VyLm1tCmluZGV4IGM0OGU3NjJkOTExMGEwN2RlODhiZjQxZmEz NjE0NmNiYmNhZDVlZjguLmUwNjNmYWVkMDI3ZWM2NDdmMzI5MmI2YWUyM2Y2YWI0NGQ0YjcwNTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1 Z2luSG9zdE1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQv TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbQpAQCAtMTIxLDcgKzEyMSw3IEBAIGJvb2wgTmV0 c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6c3Bhd25QbHVnaW5Ib3N0KGNvbnN0IFN0cmluZyYgcGx1 Z2luUGF0aCwgY3B1X3R5CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChO U1N0cmluZyAqKWxvY2FsaXphdGlvbi5nZXQoKSwgQCJsb2NhbGl6YXRpb24iLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWxdOwogCi0gICAgTlNEYXRhICpkYXRhID0g W05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBkYXRhRnJvbVByb3BlcnR5TGlzdDpsYXVuY2hQ cm9wZXJ0aWVzIGZvcm1hdDpOU1Byb3BlcnR5TGlzdEJpbmFyeUZvcm1hdF92MV8wIGVycm9yRGVz Y3JpcHRpb246MF07CisgICAgTlNEYXRhICpkYXRhID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXph dGlvbiBkYXRhV2l0aFByb3BlcnR5TGlzdDpsYXVuY2hQcm9wZXJ0aWVzIGZvcm1hdDpOU1Byb3Bl cnR5TGlzdEJpbmFyeUZvcm1hdF92MV8wIG9wdGlvbnM6MCBlcnJvcjpudWxscHRyXTsKICAgICBB U1NFUlQoZGF0YSk7CiAKICAgICBbbGF1bmNoUHJvcGVydGllcyByZWxlYXNlXTsKQEAgLTE1NCw3 ICsxNTQsNyBAQCBib29sIE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OnNwYXduUGx1Z2luSG9z dChjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIGNwdV90eQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKE5TU3RyaW5nICopcGx1Z2luUGF0aCwgQCJidW5kbGVQYXRoIiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbF07CiAgICAgCi0gICAgZGF0YSA9 IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6YXRpb24gZGF0YUZyb21Qcm9wZXJ0eUxpc3Q6aG9zdFBy b3BlcnRpZXMgZm9ybWF0Ok5TUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgZXJyb3JEZXNj cmlwdGlvbjpuaWxdOworICAgIGRhdGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIGRh dGFXaXRoUHJvcGVydHlMaXN0Omhvc3RQcm9wZXJ0aWVzIGZvcm1hdDpOU1Byb3BlcnR5TGlzdEJp bmFyeUZvcm1hdF92MV8wIG9wdGlvbnM6MCBlcnJvcjpOVUxMXTsKICAgICBBU1NFUlQoZGF0YSk7 CiAKICAgICBbaG9zdFByb3BlcnRpZXMgcmVsZWFzZV07CkBAIC0yNDYsNyArMjQ2LDcgQEAgUGFz c1JlZlB0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk+IE5ldHNjYXBlUGx1Z2luSG9zdE1h bmFnZXI6Omluc3RhbnRpYXRlUGwKICAgICBbcHJvcGVydGllcy5nZXQoKSBzZXRPYmplY3Q6W05T TnVtYmVyIG51bWJlcldpdGhCb29sOmlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRdIGZv cktleTpAImFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkIl07CiAgICAgW3Byb3BlcnRpZXMu Z2V0KCkgc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9vbDpob3N0TGF5ZXJzSW5XaW5k b3dTZXJ2ZXJdIGZvcktleTpAImhvc3RMYXllcnNJbldpbmRvd1NlcnZlciJdOwogCi0gICAgTlNE YXRhICpkYXRhID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBkYXRhRnJvbVByb3BlcnR5 TGlzdDpwcm9wZXJ0aWVzLmdldCgpIGZvcm1hdDpOU1Byb3BlcnR5TGlzdEJpbmFyeUZvcm1hdF92 MV8wIGVycm9yRGVzY3JpcHRpb246bmlsXTsKKyAgICBOU0RhdGEgKmRhdGEgPSBbTlNQcm9wZXJ0 eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFXaXRoUHJvcGVydHlMaXN0OnByb3BlcnRpZXMuZ2V0KCkg Zm9ybWF0Ok5TUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgb3B0aW9uczowIGVycm9yOm51 bGxwdHJdOwogICAgIEFTU0VSVChkYXRhKTsKICAgICAKICAgICBSZWZQdHI8TmV0c2NhcGVQbHVn aW5JbnN0YW5jZVByb3h5PiBpbnN0YW5jZSA9IE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6 Y3JlYXRlKGhvc3RQcm94eSwgcGx1Z2luVmlldywgZnVsbEZyYW1lKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdFByb3h5Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0UHJv eHkubW0KaW5kZXggMzViNGIwZWE4OGVhZTVmODM1NzJkMzg5MmY3NDQ0Y2EzNzMyZTYwYS4uNWRm ZTA2ZDM3MjViOTExNTFiN2MwMjM3ZjQxOTZkNzRhMjc0ZWE3NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkubW0KKysr IGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0UHJv eHkubW0KQEAgLTkwNCwxMyArOTA0LDEzIEBAIGtlcm5fcmV0dXJuX3QgV0tQQ0lkZW50aWZpZXJJ bmZvKG1hY2hfcG9ydF90IGNsaWVudFBvcnQsIHVpbnQ2NF90IHNlcnZlcklkZW50aWZpCiAgICAg fSBlbHNlIAogICAgICAgICBpbmZvID0gW05TTnVtYmVyIG51bWJlcldpdGhJbnQ6aWRlbnRpZmll ci0+bnVtYmVyKCldOwogCi0gICAgUmV0YWluUHRyPE5TRGF0YSo+IGRhdGEgPSBbTlNQcm9wZXJ0 eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFGcm9tUHJvcGVydHlMaXN0OmluZm8gZm9ybWF0Ok5TUHJv cGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgZXJyb3JEZXNjcmlwdGlvbjowXTsKKyAgICBOU0Rh dGEgKmRhdGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFXaXRoUHJvcGVydHlM aXN0OmluZm8gZm9ybWF0Ok5TUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgb3B0aW9uczow IGVycm9yOm51bGxwdHJdOwogICAgIEFTU0VSVChkYXRhKTsKICAgICAKLSAgICAqaW5mb0xlbmd0 aCA9IFtkYXRhLmdldCgpIGxlbmd0aF07CisgICAgKmluZm9MZW5ndGggPSBkYXRhLmxlbmd0aDsK ICAgICBtaWdfYWxsb2NhdGUocmVpbnRlcnByZXRfY2FzdDx2bV9hZGRyZXNzX3QqPihpbmZvRGF0 YSksICppbmZvTGVuZ3RoKTsKICAgICAKLSAgICBtZW1jcHkoKmluZm9EYXRhLCBbZGF0YS5nZXQo KSBieXRlc10sICppbmZvTGVuZ3RoKTsKKyAgICBtZW1jcHkoKmluZm9EYXRhLCBkYXRhLmJ5dGVz LCAqaW5mb0xlbmd0aCk7CiAgICAgCiAgICAgcmV0dXJuIEtFUk5fU1VDQ0VTUzsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5z dGFuY2VQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBl UGx1Z2luSW5zdGFuY2VQcm94eS5tbQppbmRleCA1M2E4ZWM2ZjExYjVjNGVkMmQ0OGUzMDBlZDVi ZmYwYTMzZTJhMjdkLi4xZThlOGFkMmVlOGY3ZjczOTcwYWEyOGM0YTE0MzUzMWZjNGRlNTBkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQv TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tCkBAIC0xMjQwLDcgKzEyNDAsNyBAQCBib29s IE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6ZW51bWVyYXRlKHVpbnQzMl90IG9iamVjdElE LCBkYXRhX3QmIHJlc3VsdERhdAogICAgICAgICBbYXJyYXkuZ2V0KCkgYWRkT2JqZWN0OltOU051 bWJlciBudW1iZXJXaXRoTG9uZ0xvbmc6bWV0aG9kTmFtZV1dOwogICAgIH0KIAotICAgIE5TRGF0 YSAqZGF0YSA9IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6YXRpb24gZGF0YUZyb21Qcm9wZXJ0eUxp c3Q6YXJyYXkuZ2V0KCkgZm9ybWF0Ok5TUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgZXJy b3JEZXNjcmlwdGlvbjowXTsKKyAgICBOU0RhdGEgKmRhdGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJp YWxpemF0aW9uIGRhdGFXaXRoUHJvcGVydHlMaXN0OmFycmF5LmdldCgpIGZvcm1hdDpOU1Byb3Bl cnR5TGlzdEJpbmFyeUZvcm1hdF92MV8wIG9wdGlvbnM6MCBlcnJvcjpudWxscHRyXTsKICAgICBB U1NFUlQoZGF0YSk7CiAKICAgICByZXN1bHRMZW5ndGggPSBbZGF0YSBsZW5ndGhdOwpAQCAtMTMw NSwxMyArMTMwNSwxMyBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6bWFyc2hh bFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgZAogICAgIAogICAgIGFkZFZh bHVlVG9BcnJheShhcnJheS5nZXQoKSwgZXhlYywgdmFsdWUpOwogCi0gICAgUmV0YWluUHRyPE5T RGF0YSAqPiBkYXRhID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBkYXRhRnJvbVByb3Bl cnR5TGlzdDphcnJheS5nZXQoKSBmb3JtYXQ6TlNQcm9wZXJ0eUxpc3RCaW5hcnlGb3JtYXRfdjFf MCBlcnJvckRlc2NyaXB0aW9uOjBdOworICAgIE5TRGF0YSAqZGF0YSA9IFtOU1Byb3BlcnR5TGlz dFNlcmlhbGl6YXRpb24gZGF0YVdpdGhQcm9wZXJ0eUxpc3Q6YXJyYXkuZ2V0KCkgZm9ybWF0Ok5T UHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgb3B0aW9uczowIGVycm9yOm51bGxwdHJdOwog ICAgIEFTU0VSVChkYXRhKTsKICAgICAKLSAgICByZXN1bHRMZW5ndGggPSBbZGF0YS5nZXQoKSBs ZW5ndGhdOworICAgIHJlc3VsdExlbmd0aCA9IGRhdGEubGVuZ3RoOwogICAgIG1pZ19hbGxvY2F0 ZShyZWludGVycHJldF9jYXN0PHZtX2FkZHJlc3NfdCo+KCZyZXN1bHREYXRhKSwgcmVzdWx0TGVu Z3RoKTsKICAgICAKLSAgICBtZW1jcHkocmVzdWx0RGF0YSwgW2RhdGEuZ2V0KCkgYnl0ZXNdLCBy ZXN1bHRMZW5ndGgpOworICAgIG1lbWNweShyZXN1bHREYXRhLCBkYXRhLmJ5dGVzLCByZXN1bHRM ZW5ndGgpOwogfQogCiBSZXRhaW5QdHI8TlNEYXRhICo+IE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eTo6bWFyc2hhbFZhbHVlcyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3Mp CkBAIC0xMzIxLDcgKzEzMjEsNyBAQCBSZXRhaW5QdHI8TlNEYXRhICo+IE5ldHNjYXBlUGx1Z2lu SW5zdGFuY2VQcm94eTo6bWFyc2hhbFZhbHVlcyhFeGVjU3RhdGUqIGV4ZWMsCiAgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGFyZ3Muc2l6ZSgpOyBpKyspCiAgICAgICAgIGFkZFZhbHVlVG9B cnJheShhcnJheS5nZXQoKSwgZXhlYywgYXJncy5hdChpKSk7CiAKLSAgICBSZXRhaW5QdHI8TlNE YXRhICo+IGRhdGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFGcm9tUHJvcGVy dHlMaXN0OmFycmF5LmdldCgpIGZvcm1hdDpOU1Byb3BlcnR5TGlzdEJpbmFyeUZvcm1hdF92MV8w IGVycm9yRGVzY3JpcHRpb246MF07CisgICAgTlNEYXRhICpkYXRhID0gW05TUHJvcGVydHlMaXN0 U2VyaWFsaXphdGlvbiBkYXRhV2l0aFByb3BlcnR5TGlzdDphcnJheS5nZXQoKSBmb3JtYXQ6TlNQ cm9wZXJ0eUxpc3RCaW5hcnlGb3JtYXRfdjFfMCBvcHRpb25zOjAgZXJyb3I6bnVsbHB0cl07CiAg ICAgQVNTRVJUKGRhdGEpOwogCiAgICAgcmV0dXJuIGRhdGE7CkBAIC0xMzg2LDEzICsxMzg2LDEx IEBAIEpTVmFsdWUgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpkZW1hcnNoYWxWYWx1ZShF eGVjU3RhdGUqIGV4ZWMsIGNvbnN0IGNoYXIqCiB7CiAgICAgUmV0YWluUHRyPE5TRGF0YSo+IGRh dGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzTm9Db3B5Oih2b2lkKil2 YWx1ZURhdGEgbGVuZ3RoOnZhbHVlTGVuZ3RoIGZyZWVXaGVuRG9uZTpOT10pOwogCi0gICAgUmV0 YWluUHRyPE5TQXJyYXkqPiBhcnJheSA9IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6YXRpb24gcHJv cGVydHlMaXN0RnJvbURhdGE6ZGF0YS5nZXQoKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtdXRhYmlsaXR5T3B0aW9uOk5T UHJvcGVydHlMaXN0SW1tdXRhYmxlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQ6MAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBlcnJvckRlc2NyaXB0aW9uOjBdOworICAgIE5TQXJyYXkgKmFycmF5ID0gW05TUHJvcGVydHlM aXN0U2VyaWFsaXphdGlvbiBwcm9wZXJ0eUxpc3RXaXRoRGF0YTpkYXRhLmdldCgpIG9wdGlvbnM6 TlNQcm9wZXJ0eUxpc3RJbW11dGFibGUgZm9ybWF0Om51bGxwdHIgZXJyb3I6bnVsbHB0cl07CisK ICAgICBOU1VJbnRlZ2VyIHBvc2l0aW9uID0gMDsKICAgICBKU1ZhbHVlIHZhbHVlOwotICAgIGJv b2wgcmVzdWx0ID0gZGVtYXJzaGFsVmFsdWVGcm9tQXJyYXkoZXhlYywgYXJyYXkuZ2V0KCksIHBv c2l0aW9uLCB2YWx1ZSk7CisgICAgYm9vbCByZXN1bHQgPSBkZW1hcnNoYWxWYWx1ZUZyb21BcnJh eShleGVjLCBhcnJheSwgcG9zaXRpb24sIHZhbHVlKTsKICAgICBBU1NFUlRfVU5VU0VEKHJlc3Vs dCwgcmVzdWx0KTsKIAogICAgIHJldHVybiB2YWx1ZTsKQEAgLTE0MDIsMTMgKzE0MDAsMTEgQEAg dm9pZCBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmRlbWFyc2hhbFZhbHVlcyhFeGVjU3Rh dGUqIGV4ZWMsIGRhdGFfdCB2YWx1ZXMKIHsKICAgICBSZXRhaW5QdHI8TlNEYXRhKj4gZGF0YSA9 IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6dmFsdWVzRGF0YSBs ZW5ndGg6dmFsdWVzTGVuZ3RoIGZyZWVXaGVuRG9uZTpOT10pOwogCi0gICAgUmV0YWluUHRyPE5T QXJyYXkqPiBhcnJheSA9IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6YXRpb24gcHJvcGVydHlMaXN0 RnJvbURhdGE6ZGF0YS5nZXQoKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtdXRhYmlsaXR5T3B0aW9uOk5TUHJvcGVydHlM aXN0SW1tdXRhYmxlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQ6MAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcnJvckRl c2NyaXB0aW9uOjBdOworICAgIE5TQXJyYXkgKmFycmF5ID0gW05TUHJvcGVydHlMaXN0U2VyaWFs aXphdGlvbiBwcm9wZXJ0eUxpc3RXaXRoRGF0YTpkYXRhLmdldCgpIG9wdGlvbnM6TlNQcm9wZXJ0 eUxpc3RJbW11dGFibGUgZm9ybWF0Om51bGxwdHIgZXJyb3I6bnVsbHB0cl07CisKICAgICBOU1VJ bnRlZ2VyIHBvc2l0aW9uID0gMDsKICAgICBKU1ZhbHVlIHZhbHVlOwotICAgIHdoaWxlIChkZW1h cnNoYWxWYWx1ZUZyb21BcnJheShleGVjLCBhcnJheS5nZXQoKSwgcG9zaXRpb24sIHZhbHVlKSkK KyAgICB3aGlsZSAoZGVtYXJzaGFsVmFsdWVGcm9tQXJyYXkoZXhlYywgYXJyYXksIHBvc2l0aW9u LCB2YWx1ZSkpCiAgICAgICAgIHJlc3VsdC5hcHBlbmQodmFsdWUpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9Qcm94eUluc3RhbmNlLm1tIGIvU291 cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvUHJveHlJbnN0YW5jZS5tbQppbmRleCA2ZTYw MTQ5OWRjY2IyOWRkZTVhNDk5MTI1Y2VkMzE3NWRjZGQ3MmE2Li4wMzM1NmNjZmNiYmU5MzNhYWE3 MzM4NDc4ZDFjZjdmNGU1MzVjOWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVn aW5zL0hvc3RlZC9Qcm94eUluc3RhbmNlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdp bnMvSG9zdGVkL1Byb3h5SW5zdGFuY2UubW0KQEAgLTMxMiwxMiArMzEyLDkgQEAgdm9pZCBQcm94 eUluc3RhbmNlOjpnZXRQcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1l QXJyYXkmIG5hbWVBcnIKICAgICBpZiAoIXJlcGx5IHx8ICFyZXBseS0+bV9yZXR1cm5WYWx1ZSkK ICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIFJldGFpblB0cjxOU0FycmF5Kj4gYXJyYXkgPSBb TlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIHByb3BlcnR5TGlzdEZyb21EYXRhOihOU0RhdGEg KilyZXBseS0+bV9yZXN1bHQuZ2V0KCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXV0YWJpbGl0eU9wdGlvbjpOU1Byb3Bl cnR5TGlzdEltbXV0YWJsZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0OjAKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXJy b3JEZXNjcmlwdGlvbjowXTsKKyAgICBOU0FycmF5ICphcnJheSA9IFtOU1Byb3BlcnR5TGlzdFNl cmlhbGl6YXRpb24gcHJvcGVydHlMaXN0V2l0aERhdGE6KE5TRGF0YSAqKXJlcGx5LT5tX3Jlc3Vs dC5nZXQoKSBvcHRpb25zOk5TUHJvcGVydHlMaXN0SW1tdXRhYmxlIGZvcm1hdDpudWxscHRyIGVy cm9yOm51bGxwdHJdOwogICAgIAotICAgIGZvciAoTlNOdW1iZXIgKm51bWJlciBpbiBhcnJheS5n ZXQoKSkgeworICAgIGZvciAoTlNOdW1iZXIgKm51bWJlciBpbiBhcnJheSkgewogICAgICAgICBJ ZGVudGlmaWVyUmVwKiBpZGVudGlmaWVyID0gcmVpbnRlcnByZXRfY2FzdDxJZGVudGlmaWVyUmVw Kj4oW251bWJlciBsb25nTG9uZ1ZhbHVlXSk7CiAgICAgICAgIGlmICghSWRlbnRpZmllclJlcDo6 aXNWYWxpZChpZGVudGlmaWVyKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwo=