43541 2010-08-05 00:10:07 -0700 Web Inspector: forbid InspectorController to create script objects directly in the frontend 2010-08-05 05:38:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 260444 0 yurys 2010-08-05 00:10:07 -0700 Web Inspector: forbid InspectorController to create script objects directly in the frontend 260447 1 63561 yurys 2010-08-05 00:14:44 -0700 Created attachment 63561 Patch 260539 2 yurys 2010-08-05 05:38:26 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... D WebCore/bindings/js/ScriptArray.cpp D WebCore/bindings/js/ScriptArray.h D WebCore/bindings/v8/ScriptArray.cpp D WebCore/bindings/v8/ScriptArray.h M WebCore/ChangeLog M WebCore/GNUmakefile.am M WebCore/WebCore.gypi M WebCore/WebCore.pro M WebCore/WebCore.vcproj/WebCore.vcproj M WebCore/WebCore.xcodeproj/project.pbxproj M WebCore/bindings/js/IDBBindingUtilities.h M WebCore/bindings/js/ScheduledAction.cpp M WebCore/bindings/js/ScriptCallStack.h M WebCore/bindings/js/ScriptObject.cpp M WebCore/bindings/js/ScriptObject.h M WebCore/bindings/v8/ScheduledAction.cpp M WebCore/bindings/v8/ScriptCallStack.h M WebCore/bindings/v8/ScriptObject.cpp M WebCore/bindings/v8/ScriptObject.h M WebCore/loader/FrameLoader.cpp M WebCore/page/Frame.cpp Committed r64735 63561 2010-08-05 00:14:44 -0700 2010-08-05 01:25:29 -0700 Patch bug-43541-20100805111441.patch text/plain 20613 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODVjN2Y0YjkzZGQ3MGI4OWE5NWFiZWZmYjgwZDcxZGNlZDFmZDc1NS4uMTc4NzU3N2UyNDJlMTRm NzRhMGNiOGQzNDQ3ZDFkY2I2MjI2ZTBlNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNSBAQAogMjAxMC0wOC0wNSAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmb3JiaWQgSW5zcGVj dG9yQ29udHJvbGxlciB0byBjcmVhdGUgc2NyaXB0IG9iamVjdHMgZGlyZWN0bHkgaW4gdGhlIGZy b250ZW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MzU0MQorCisgICAgICAgIENvb2tpZSBhbmQgQXBwQ2FjaGUgZGF0YSBhcmUgbm93IHNlcmlhbGl6 ZWQgaW50byBJbnNwZWN0b3JWYWx1ZXMgaW5zdGVhZCBvZgorICAgICAgICBTY3JpcHRPYmplY3Rz LiBUaGVzZSB3ZXJlIGxhc3QgdXNhZ2VzIG9mIEluc3BlY3RvckZyb250ZW5kOjpuZXdTY3JpcHR7 T2JqZWN0LEFycmF5fQorICAgICAgICBzbyB3ZSBjYW4gcmVtb3ZlIHRoZW0gbm93IGFuZCB1c2Ug b25seSBJbnNwZWN0b3JWYWx1ZXMgdG8gcGFzcyBkYXRhIHRvIHRoZSBpbnNwZWN0b3IKKyAgICAg ICAgZnJvbnRlbmQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmlkbDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDo6SW5zcGVjdG9yQXBw bGljYXRpb25DYWNoZUFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFwcGxpY2F0 aW9uQ2FjaGVBZ2VudDo6Z2V0QXBwbGljYXRpb25DYWNoZXMpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50OjpidWlsZE9iamVjdEZvckFwcGxpY2F0aW9u Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50 OjpidWlsZEFycmF5Rm9yQXBwbGljYXRpb25DYWNoZVJlc291cmNlcyk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQXBwbGlj YXRpb25DYWNoZVJlc291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQXBwbGlj YXRpb25DYWNoZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZy b250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmdldENvb2tp ZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6YnVpbGRBcnJheUZv ckNvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6YnVpbGRP YmplY3RGb3JDb29raWUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kOjpzZXRSZWNvcmRpbmdQcm9maWxlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaDoKKworMjAxMC0wOC0wNSAgWXVyeSBT ZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBQ YXZlbCBGZWxkbWFuLgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNlcmlhbGl6ZSBET00gc3Rv cmFnZSBpdGVtcyB0byBJbnNwZWN0b3JWYWx1ZXMKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5pZGwgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4 IDQxOTE3ODBjMjY4NGUyODUyZjhjY2JkNmViNWU5NzMwYjZhZGZlMmIuLmNlYTY4M2JkYTRjZmVm NzRjMjdmZGNjZjRmMzk1ODBiZTMxNzQyYTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvci5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApAQCAt NjAsNiArNjAsMTAgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbbm90aWZ5XSB2b2lkIHVwZGF0 ZURPTVN0b3JhZ2Uob3V0IGludCBzdG9yYWdlSWQpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHNl bGVjdERPTVN0b3JhZ2Uob3V0IGludCBzdG9yYWdlSWQpOwogI2VuZGlmCisjaWYgZGVmaW5lZChF TkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKSAmJiBFTkFCTEVfT0ZGTElORV9XRUJfQVBQ TElDQVRJT05TCisgICAgICAgIFtub3RpZnldIHZvaWQgdXBkYXRlQXBwbGljYXRpb25DYWNoZVN0 YXR1cyhvdXQgaW50IHN0YXR1cyk7CisgICAgICAgIFtub3RpZnldIHZvaWQgdXBkYXRlTmV0d29y a1N0YXRlKG91dCBib29sZWFuIGlzTm93T25saW5lKTsKKyNlbmRpZgogCiAgICAgICAgIFtoYW5k bGVyPUNvbnRyb2xsZXJdIHZvaWQgc3RvcmVMYXN0QWN0aXZlUGFuZWwoaW4gU3RyaW5nIHBhbmVs TmFtZSk7CiAKQEAgLTE1NCwxMSArMTU4LDExIEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgW2hh bmRsZXI9RE9NXSB2b2lkIHNldFJ1bGVTZWxlY3RvcihpbiBsb25nIGNhbGxJZCwgaW4gbG9uZyBy dWxlSWQsIGluIFN0cmluZyBzZWxlY3RvciwgaW4gbG9uZyBzZWxlY3RlZE5vZGVJZCwgb3V0IFZh bHVlIHJ1bGUsIG91dCBib29sZWFuIHNlbGVjdG9yQWZmZWN0c05vZGUpOwogICAgICAgICBbaGFu ZGxlcj1ET01dIHZvaWQgYWRkUnVsZShpbiBsb25nIGNhbGxJZCwgaW4gU3RyaW5nIHNlbGVjdG9y LCBpbiBsb25nIHNlbGVjdGVkTm9kZUlkLCBvdXQgVmFsdWUgcnVsZSwgb3V0IGJvb2xlYW4gc2Vs ZWN0b3JBZmZlY3RzTm9kZSk7CiAKLSAgICAgICAgW2hhbmRsZXI9Q29udHJvbGxlcl0gdm9pZCBn ZXRDb29raWVzKGluIGxvbmcgY2FsbElkKTsKKyAgICAgICAgW2hhbmRsZXI9Q29udHJvbGxlcl0g dm9pZCBnZXRDb29raWVzKGluIGxvbmcgY2FsbElkLCBvdXQgQXJyYXkgY29va2llcywgb3V0IFN0 cmluZyBjb29raWVzU3RyaW5nKTsKICAgICAgICAgW2hhbmRsZXI9Q29udHJvbGxlcl0gdm9pZCBk ZWxldGVDb29raWUoaW4gU3RyaW5nIGNvb2tpZU5hbWUsIGluIFN0cmluZyBkb21haW4pOwogCiAj aWYgZGVmaW5lZChFTkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKSAmJiBFTkFCTEVfT0ZG TElORV9XRUJfQVBQTElDQVRJT05TCi0gICAgICAgIFtoYW5kbGVyPUFwcGxpY2F0aW9uQ2FjaGVd IHZvaWQgZ2V0QXBwbGljYXRpb25DYWNoZXMoaW4gbG9uZyBjYWxsSWQpOworICAgICAgICBbaGFu ZGxlcj1BcHBsaWNhdGlvbkNhY2hlXSB2b2lkIGdldEFwcGxpY2F0aW9uQ2FjaGVzKGluIGxvbmcg Y2FsbElkLCBvdXQgVmFsdWUgYXBwbGljYXRpb25DYWNoZXMpOwogI2VuZGlmCiAKICAgICAgICAg W2hhbmRsZXI9QmFja2VuZF0gdm9pZCByZWxlYXNlV3JhcHBlck9iamVjdEdyb3VwKGluIGxvbmcg aW5qZWN0ZWRTY3JpcHRJZCwgaW4gU3RyaW5nIG9iamVjdEdyb3VwKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudC5jcHAgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQuY3BwCmluZGV4IDFl YTc1NTZhNWVlNzI1MTZmMmQyZWYyODQ0ZTM2NmI0MmFjMmZlZTIuLmNmMzgzOWVjNWQ5MWI2NTMy MDJmOTg1OGEyZTVjYzZhNzc3Y2U2NWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50LmNwcApAQCAtMzMsMTUgKzMzLDE2IEBACiAj aW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIklu c3BlY3RvckNvbnRyb2xsZXIuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5oIgorI2lu Y2x1ZGUgIkluc3BlY3RvclZhbHVlcy5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKKyNpbmNsdWRlICJS ZW1vdGVJbnNwZWN0b3JGcm9udGVuZC5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVzcG9uc2UuaCIK ICNpbmNsdWRlICJTY3JpcHRBcnJheS5oIgogI2luY2x1ZGUgIlNjcmlwdE9iamVjdC5oIgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKLUluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDo6SW5z cGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50KEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3BlY3Rv ckNvbnRyb2xsZXIsIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKK0luc3BlY3RvckFwcGxp Y2F0aW9uQ2FjaGVBZ2VudDo6SW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50KEluc3BlY3Rv ckNvbnRyb2xsZXIqIGluc3BlY3RvckNvbnRyb2xsZXIsIFJlbW90ZUluc3BlY3RvckZyb250ZW5k KiBmcm9udGVuZCkKICAgICA6IG1faW5zcGVjdG9yQ29udHJvbGxlcihpbnNwZWN0b3JDb250cm9s bGVyKQogICAgICwgbV9mcm9udGVuZChmcm9udGVuZCkKIHsKQEAgLTY1LDQ5ICs2Niw0OSBAQCB2 b2lkIEluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDo6dXBkYXRlTmV0d29ya1N0YXRlKGJv b2wgaXNOb3dPbmxpbmUpCiB2b2lkIEluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDo6Z2V0 QXBwbGljYXRpb25DYWNoZXMobG9uZyBjYWxsSWQpCiB7CiAgICAgRG9jdW1lbnRMb2FkZXIqIGRv Y3VtZW50TG9hZGVyID0gbV9pbnNwZWN0b3JDb250cm9sbGVyLT5pbnNwZWN0ZWRQYWdlKCktPm1h aW5GcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKTsKLSAgICBpZiAoIWRvY3VtZW50 TG9hZGVyKSB7Ci0gICAgICAgIG1fZnJvbnRlbmQtPmRpZEdldEFwcGxpY2F0aW9uQ2FjaGVzKGNh bGxJZCwgU2NyaXB0VmFsdWU6OnVuZGVmaW5lZCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K LQotICAgIEFwcGxpY2F0aW9uQ2FjaGVIb3N0KiBob3N0ID0gZG9jdW1lbnRMb2FkZXItPmFwcGxp Y2F0aW9uQ2FjaGVIb3N0KCk7Ci0gICAgQXBwbGljYXRpb25DYWNoZUhvc3Q6OkNhY2hlSW5mbyBp bmZvID0gaG9zdC0+YXBwbGljYXRpb25DYWNoZUluZm8oKTsKLSAKLSAgICBBcHBsaWNhdGlvbkNh Y2hlSG9zdDo6UmVzb3VyY2VJbmZvTGlzdCByZXNvdXJjZXM7Ci0gICAgaG9zdC0+ZmlsbFJlc291 cmNlTGlzdCgmcmVzb3VyY2VzKTsKLQotICAgIG1fZnJvbnRlbmQtPmRpZEdldEFwcGxpY2F0aW9u Q2FjaGVzKGNhbGxJZCwgYnVpbGRPYmplY3RGb3JBcHBsaWNhdGlvbkNhY2hlKHJlc291cmNlcywg aW5mbykpOworICAgIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gYXBwbGljYXRpb25DYWNoZXM7Cisg ICAgaWYgKGRvY3VtZW50TG9hZGVyKSB7CisgICAgICAgIEFwcGxpY2F0aW9uQ2FjaGVIb3N0KiBo b3N0ID0gZG9jdW1lbnRMb2FkZXItPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCk7CisgICAgICAgIEFw cGxpY2F0aW9uQ2FjaGVIb3N0OjpDYWNoZUluZm8gaW5mbyA9IGhvc3QtPmFwcGxpY2F0aW9uQ2Fj aGVJbmZvKCk7CisKKyAgICAgICAgQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5mb0xp c3QgcmVzb3VyY2VzOworICAgICAgICBob3N0LT5maWxsUmVzb3VyY2VMaXN0KCZyZXNvdXJjZXMp OworICAgICAgICBhcHBsaWNhdGlvbkNhY2hlcyA9IGJ1aWxkT2JqZWN0Rm9yQXBwbGljYXRpb25D YWNoZShyZXNvdXJjZXMsIGluZm8pOworICAgIH0gZWxzZQorICAgICAgICBhcHBsaWNhdGlvbkNh Y2hlcyA9IEluc3BlY3RvclZhbHVlOjpudWxsKCk7CisKKyAgICBtX2Zyb250ZW5kLT5kaWRHZXRB cHBsaWNhdGlvbkNhY2hlcyhjYWxsSWQsIGFwcGxpY2F0aW9uQ2FjaGVzKTsKIH0KIAotU2NyaXB0 T2JqZWN0IEluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDo6YnVpbGRPYmplY3RGb3JBcHBs aWNhdGlvbkNhY2hlKGNvbnN0IEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpSZXNvdXJjZUluZm9MaXN0 JiBhcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2VzLCBjb25zdCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6 Q2FjaGVJbmZvJiBhcHBsaWNhdGlvbkNhY2hlSW5mbykKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQXBwbGlj YXRpb25DYWNoZShjb25zdCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6UmVzb3VyY2VJbmZvTGlzdCYg YXBwbGljYXRpb25DYWNoZVJlc291cmNlcywgY29uc3QgQXBwbGljYXRpb25DYWNoZUhvc3Q6OkNh Y2hlSW5mbyYgYXBwbGljYXRpb25DYWNoZUluZm8pCiB7Ci0gICAgU2NyaXB0T2JqZWN0IHZhbHVl ID0gbV9mcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7Ci0gICAgdmFsdWUuc2V0KCJzaXplIiwg YXBwbGljYXRpb25DYWNoZUluZm8ubV9zaXplKTsKLSAgICB2YWx1ZS5zZXQoIm1hbmlmZXN0Iiwg YXBwbGljYXRpb25DYWNoZUluZm8ubV9tYW5pZmVzdC5zdHJpbmcoKSk7Ci0gICAgdmFsdWUuc2V0 KCJsYXN0UGF0aENvbXBvbmVudCIsIGFwcGxpY2F0aW9uQ2FjaGVJbmZvLm1fbWFuaWZlc3QubGFz dFBhdGhDb21wb25lbnQoKSk7Ci0gICAgdmFsdWUuc2V0KCJjcmVhdGlvblRpbWUiLCBhcHBsaWNh dGlvbkNhY2hlSW5mby5tX2NyZWF0aW9uVGltZSk7Ci0gICAgdmFsdWUuc2V0KCJ1cGRhdGVUaW1l IiwgYXBwbGljYXRpb25DYWNoZUluZm8ubV91cGRhdGVUaW1lKTsKLSAgICB2YWx1ZS5zZXQoInJl c291cmNlcyIsIGJ1aWxkQXJyYXlGb3JBcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2VzKGFwcGxpY2F0 aW9uQ2FjaGVSZXNvdXJjZXMpKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiB2YWx1ZSA9 IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CisgICAgdmFsdWUtPnNldE51bWJlcigic2l6ZSIs IGFwcGxpY2F0aW9uQ2FjaGVJbmZvLm1fc2l6ZSk7CisgICAgdmFsdWUtPnNldFN0cmluZygibWFu aWZlc3QiLCBhcHBsaWNhdGlvbkNhY2hlSW5mby5tX21hbmlmZXN0LnN0cmluZygpKTsKKyAgICB2 YWx1ZS0+c2V0U3RyaW5nKCJsYXN0UGF0aENvbXBvbmVudCIsIGFwcGxpY2F0aW9uQ2FjaGVJbmZv Lm1fbWFuaWZlc3QubGFzdFBhdGhDb21wb25lbnQoKSk7CisgICAgdmFsdWUtPnNldE51bWJlcigi Y3JlYXRpb25UaW1lIiwgYXBwbGljYXRpb25DYWNoZUluZm8ubV9jcmVhdGlvblRpbWUpOworICAg IHZhbHVlLT5zZXROdW1iZXIoInVwZGF0ZVRpbWUiLCBhcHBsaWNhdGlvbkNhY2hlSW5mby5tX3Vw ZGF0ZVRpbWUpOworICAgIHZhbHVlLT5zZXQoInJlc291cmNlcyIsIGJ1aWxkQXJyYXlGb3JBcHBs aWNhdGlvbkNhY2hlUmVzb3VyY2VzKGFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZXMpKTsKICAgICBy ZXR1cm4gdmFsdWU7CiB9CiAKLVNjcmlwdEFycmF5IEluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVB Z2VudDo6YnVpbGRBcnJheUZvckFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZXMoY29uc3QgQXBwbGlj YXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5mb0xpc3QmIGFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJj ZXMpCitQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hl QWdlbnQ6OmJ1aWxkQXJyYXlGb3JBcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2VzKGNvbnN0IEFwcGxp Y2F0aW9uQ2FjaGVIb3N0OjpSZXNvdXJjZUluZm9MaXN0JiBhcHBsaWNhdGlvbkNhY2hlUmVzb3Vy Y2VzKQogewotICAgIFNjcmlwdEFycmF5IHJlc291cmNlcyA9IG1fZnJvbnRlbmQtPm5ld1Njcmlw dEFycmF5KCk7CisgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiByZXNvdXJjZXMgPSBJbnNwZWN0 b3JBcnJheTo6Y3JlYXRlKCk7CiAKICAgICBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6UmVzb3VyY2VJ bmZvTGlzdDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gYXBwbGljYXRpb25DYWNoZVJlc291cmNlcy5l bmQoKTsKICAgICBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6UmVzb3VyY2VJbmZvTGlzdDo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBhcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2VzLmJlZ2luKCk7CiAgICAgZm9y IChpbnQgaSA9IDA7IGl0ICE9IGVuZDsgKytpdCwgaSsrKQotICAgICAgICByZXNvdXJjZXMuc2V0 KGksIGJ1aWxkT2JqZWN0Rm9yQXBwbGljYXRpb25DYWNoZVJlc291cmNlKCppdCkpOworICAgICAg ICByZXNvdXJjZXMtPnB1c2goYnVpbGRPYmplY3RGb3JBcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2Uo Kml0KSk7CiAKICAgICByZXR1cm4gcmVzb3VyY2VzOwogfQogCi1TY3JpcHRPYmplY3QgSW5zcGVj dG9yQXBwbGljYXRpb25DYWNoZUFnZW50OjpidWlsZE9iamVjdEZvckFwcGxpY2F0aW9uQ2FjaGVS ZXNvdXJjZShjb25zdCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6UmVzb3VyY2VJbmZvJiByZXNvdXJj ZUluZm8pCitQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yQXBwbGljYXRpb25D YWNoZUFnZW50OjpidWlsZE9iamVjdEZvckFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZShjb25zdCBB cHBsaWNhdGlvbkNhY2hlSG9zdDo6UmVzb3VyY2VJbmZvJiByZXNvdXJjZUluZm8pCiB7Ci0gICAg U2NyaXB0T2JqZWN0IHZhbHVlID0gbV9mcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7Ci0gICAg dmFsdWUuc2V0KCJuYW1lIiwgcmVzb3VyY2VJbmZvLm1fcmVzb3VyY2Uuc3RyaW5nKCkpOwotICAg IHZhbHVlLnNldCgic2l6ZSIsIHJlc291cmNlSW5mby5tX3NpemUpOworICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IHZhbHVlID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKKyAgICB2YWx1 ZS0+c2V0U3RyaW5nKCJuYW1lIiwgcmVzb3VyY2VJbmZvLm1fcmVzb3VyY2Uuc3RyaW5nKCkpOwor ICAgIHZhbHVlLT5zZXROdW1iZXIoInNpemUiLCByZXNvdXJjZUluZm8ubV9zaXplKTsKIAogICAg IFN0cmluZyB0eXBlczsKICAgICBpZiAocmVzb3VyY2VJbmZvLm1faXNNYXN0ZXIpCkBAIC0xMjUs NyArMTI2LDcgQEAgU2NyaXB0T2JqZWN0IEluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDo6 YnVpbGRPYmplY3RGb3JBcHBsaWNhdGlvbkNhY2hlUmVzb3UKICAgICBpZiAocmVzb3VyY2VJbmZv Lm1faXNFeHBsaWNpdCkKICAgICAgICAgdHlwZXMuYXBwZW5kKCJFeHBsaWNpdCAiKTsKIAotICAg IHZhbHVlLnNldCgidHlwZSIsIHR5cGVzKTsKKyAgICB2YWx1ZS0+c2V0U3RyaW5nKCJ0eXBlIiwg dHlwZXMpOwogICAgIHJldHVybiB2YWx1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQuaAppbmRleCAzM2NjMmVkYzVlOThhZTY1 ZjA0ODZjZWFjMTE0NGFkNjliOTI3Y2Q0Li5lMDNiYTRjZWY3ZWVjNjZkYjI3NzQ5YTc4YjcyMWNi YTI1MmEwNjE4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBcHBsaWNh dGlvbkNhY2hlQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBcHBsaWNh dGlvbkNhY2hlQWdlbnQuaApAQCAtMjksMTggKzI5LDE5IEBACiAKICNpbmNsdWRlICJBcHBsaWNh dGlvbkNhY2hlSG9zdC5oIgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUg PHd0Zi9QYXNzUmVmUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgSW5zcGVj dG9yQXJyYXk7CiBjbGFzcyBJbnNwZWN0b3JDb250cm9sbGVyOwotY2xhc3MgSW5zcGVjdG9yRnJv bnRlbmQ7CitjbGFzcyBJbnNwZWN0b3JPYmplY3Q7CitjbGFzcyBSZW1vdGVJbnNwZWN0b3JGcm9u dGVuZDsKIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7Ci1jbGFzcyBTY3JpcHRBcnJheTsKLWNsYXNz IFNjcmlwdE9iamVjdDsKIAogY2xhc3MgSW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50IDog cHVibGljIE5vbmNvcHlhYmxlIHsKIHB1YmxpYzoKLSAgICBJbnNwZWN0b3JBcHBsaWNhdGlvbkNh Y2hlQWdlbnQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxlciwgSW5zcGVj dG9yRnJvbnRlbmQqIGZyb250ZW5kKTsKKyAgICBJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdl bnQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxlciwgUmVtb3RlSW5zcGVj dG9yRnJvbnRlbmQqIGZyb250ZW5kKTsKICAgICB+SW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFn ZW50KCkgeyB9CiAKICAgICAvLyBCYWNrZW5kIHRvIEZyb250ZW5kCkBAIC01MiwxMiArNTMsMTIg QEAgcHVibGljOgogICAgIHZvaWQgZ2V0QXBwbGljYXRpb25DYWNoZXMobG9uZyBjYWxsSWQpOwog CiBwcml2YXRlOgotICAgIFNjcmlwdE9iamVjdCBidWlsZE9iamVjdEZvckFwcGxpY2F0aW9uQ2Fj aGUoY29uc3QgQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5mb0xpc3QmLCBjb25zdCBB cHBsaWNhdGlvbkNhY2hlSG9zdDo6Q2FjaGVJbmZvJik7Ci0gICAgU2NyaXB0QXJyYXkgYnVpbGRB cnJheUZvckFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZXMoY29uc3QgQXBwbGljYXRpb25DYWNoZUhv c3Q6OlJlc291cmNlSW5mb0xpc3QmKTsKLSAgICBTY3JpcHRPYmplY3QgYnVpbGRPYmplY3RGb3JB cHBsaWNhdGlvbkNhY2hlUmVzb3VyY2UoY29uc3QgQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291 cmNlSW5mbyYpOworICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZv ckFwcGxpY2F0aW9uQ2FjaGUoY29uc3QgQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5m b0xpc3QmLCBjb25zdCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6Q2FjaGVJbmZvJik7CisgICAgUGFz c1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gYnVpbGRBcnJheUZvckFwcGxpY2F0aW9uQ2FjaGVSZXNv dXJjZXMoY29uc3QgQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5mb0xpc3QmKTsKKyAg ICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JBcHBsaWNhdGlvbkNh Y2hlUmVzb3VyY2UoY29uc3QgQXBwbGljYXRpb25DYWNoZUhvc3Q6OlJlc291cmNlSW5mbyYpOwog CiAgICAgSW5zcGVjdG9yQ29udHJvbGxlciogbV9pbnNwZWN0b3JDb250cm9sbGVyOwotICAgIElu c3BlY3RvckZyb250ZW5kKiBtX2Zyb250ZW5kOworICAgIFJlbW90ZUluc3BlY3RvckZyb250ZW5k KiBtX2Zyb250ZW5kOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCBjY2IwZGQ0YTBiNjBlYjVkZDVlOTMx YWIxMzhmMDZhY2E5MTkwYTcxLi4yMDUyYWRiYzM0NTE2YTY3Nzg1N2U0YzQyMjJjMzYwOGI5ZDk3 Y2MyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNTMz LDcgKzUzMyw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKGNv bnN0IFNjcmlwdE9iamVjdCYgd2ViSW5zcGVjdG9yKQogICAgIHNob3dQYW5lbChtX3Nob3dBZnRl clZpc2libGUpOwogCiAjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUykKLSAgICBt X2FwcGxpY2F0aW9uQ2FjaGVBZ2VudCA9IG5ldyBJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdl bnQodGhpcywgbV9mcm9udGVuZC5nZXQoKSk7CisgICAgbV9hcHBsaWNhdGlvbkNhY2hlQWdlbnQg PSBuZXcgSW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50KHRoaXMsIG1fcmVtb3RlRnJvbnRl bmQuZ2V0KCkpOwogI2VuZGlmCiAKICAgICBpZiAoIWNvbm5lY3RlZEZyb250ZW5kQ291bnQpCkBA IC0xMzAwLDcgKzEzMDAsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZE9wZW5EYXRh YmFzZShQYXNzUmVmUHRyPERhdGFiYXNlPiBkYXRhYmFzZSwgY29uc3QgUwogCiB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OmdldENvb2tpZXMobG9uZyBjYWxsSWQpCiB7Ci0gICAgaWYgKCFtX2Zy b250ZW5kKQorICAgIGlmICghbV9yZW1vdGVGcm9udGVuZCkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgLy8gSWYgd2UgY2FuIGdldCByYXcgY29va2llcy4KQEAgLTEzMzYsMzYgKzEzMzYsNDEgQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRDb29raWVzKGxvbmcgY2FsbElkKQogICAgICAg ICB9CiAgICAgfQogCi0gICAgaWYgKCFyYXdDb29raWVzSW1wbGVtZW50ZWQpCi0gICAgICAgIG1f ZnJvbnRlbmQtPmRpZEdldENvb2tpZXMoY2FsbElkLCBtX2Zyb250ZW5kLT5uZXdTY3JpcHRBcnJh eSgpLCBzdHJpbmdDb29raWVzTGlzdCk7Ci0gICAgZWxzZQotICAgICAgICBtX2Zyb250ZW5kLT5k aWRHZXRDb29raWVzKGNhbGxJZCwgYnVpbGRBcnJheUZvckNvb2tpZXMocmF3Q29va2llc0xpc3Qp LCBTdHJpbmcoKSk7CisgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjb29raWVzOworICAgIFN0 cmluZyBjb29raWVzU3RyaW5nOworICAgIGlmIChyYXdDb29raWVzSW1wbGVtZW50ZWQpCisgICAg ICAgIGNvb2tpZXMgPSBidWlsZEFycmF5Rm9yQ29va2llcyhyYXdDb29raWVzTGlzdCk7CisgICAg ZWxzZSB7CisgICAgICAgIGNvb2tpZXMgPSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCk7CisgICAg ICAgIGNvb2tpZXNTdHJpbmcgPSBzdHJpbmdDb29raWVzTGlzdDsKKyAgICB9CisgICAgbV9yZW1v dGVGcm9udGVuZC0+ZGlkR2V0Q29va2llcyhjYWxsSWQsIGNvb2tpZXMsIGNvb2tpZXNTdHJpbmcp OwogfQogCi1TY3JpcHRBcnJheSBJbnNwZWN0b3JDb250cm9sbGVyOjpidWlsZEFycmF5Rm9yQ29v a2llcyhMaXN0SGFzaFNldDxDb29raWU+JiBjb29raWVzTGlzdCkKK1Bhc3NSZWZQdHI8SW5zcGVj dG9yQXJyYXk+IEluc3BlY3RvckNvbnRyb2xsZXI6OmJ1aWxkQXJyYXlGb3JDb29raWVzKExpc3RI YXNoU2V0PENvb2tpZT4mIGNvb2tpZXNMaXN0KQogewotICAgIFNjcmlwdEFycmF5IGNvb2tpZXMg PSBtX2Zyb250ZW5kLT5uZXdTY3JpcHRBcnJheSgpOworICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJh eT4gY29va2llcyA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKIAogICAgIExpc3RIYXNoU2V0 PENvb2tpZT46Oml0ZXJhdG9yIGVuZCA9IGNvb2tpZXNMaXN0LmVuZCgpOwogICAgIExpc3RIYXNo U2V0PENvb2tpZT46Oml0ZXJhdG9yIGl0ID0gY29va2llc0xpc3QuYmVnaW4oKTsKICAgICBmb3Ig KGludCBpID0gMDsgaXQgIT0gZW5kOyArK2l0LCBpKyspCi0gICAgICAgIGNvb2tpZXMuc2V0KGks IGJ1aWxkT2JqZWN0Rm9yQ29va2llKCppdCkpOworICAgICAgICBjb29raWVzLT5wdXNoKGJ1aWxk T2JqZWN0Rm9yQ29va2llKCppdCkpOwogCiAgICAgcmV0dXJuIGNvb2tpZXM7CiB9CiAKLVNjcmlw dE9iamVjdCBJbnNwZWN0b3JDb250cm9sbGVyOjpidWlsZE9iamVjdEZvckNvb2tpZShjb25zdCBD b29raWUmIGNvb2tpZSkKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJbnNwZWN0b3JDb250 cm9sbGVyOjpidWlsZE9iamVjdEZvckNvb2tpZShjb25zdCBDb29raWUmIGNvb2tpZSkKIHsKLSAg ICBTY3JpcHRPYmplY3QgdmFsdWUgPSBtX2Zyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKLSAg ICB2YWx1ZS5zZXQoIm5hbWUiLCBjb29raWUubmFtZSk7Ci0gICAgdmFsdWUuc2V0KCJ2YWx1ZSIs IGNvb2tpZS52YWx1ZSk7Ci0gICAgdmFsdWUuc2V0KCJkb21haW4iLCBjb29raWUuZG9tYWluKTsK LSAgICB2YWx1ZS5zZXQoInBhdGgiLCBjb29raWUucGF0aCk7Ci0gICAgdmFsdWUuc2V0KCJleHBp cmVzIiwgY29va2llLmV4cGlyZXMpOwotICAgIHZhbHVlLnNldCgic2l6ZSIsIChjb29raWUubmFt ZS5sZW5ndGgoKSArIGNvb2tpZS52YWx1ZS5sZW5ndGgoKSkpOwotICAgIHZhbHVlLnNldCgiaHR0 cE9ubHkiLCBjb29raWUuaHR0cE9ubHkpOwotICAgIHZhbHVlLnNldCgic2VjdXJlIiwgY29va2ll LnNlY3VyZSk7Ci0gICAgdmFsdWUuc2V0KCJzZXNzaW9uIiwgY29va2llLnNlc3Npb24pOworICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHZhbHVlID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUo KTsKKyAgICB2YWx1ZS0+c2V0U3RyaW5nKCJuYW1lIiwgY29va2llLm5hbWUpOworICAgIHZhbHVl LT5zZXRTdHJpbmcoInZhbHVlIiwgY29va2llLnZhbHVlKTsKKyAgICB2YWx1ZS0+c2V0U3RyaW5n KCJkb21haW4iLCBjb29raWUuZG9tYWluKTsKKyAgICB2YWx1ZS0+c2V0U3RyaW5nKCJwYXRoIiwg Y29va2llLnBhdGgpOworICAgIHZhbHVlLT5zZXROdW1iZXIoImV4cGlyZXMiLCBjb29raWUuZXhw aXJlcyk7CisgICAgdmFsdWUtPnNldE51bWJlcigic2l6ZSIsIChjb29raWUubmFtZS5sZW5ndGgo KSArIGNvb2tpZS52YWx1ZS5sZW5ndGgoKSkpOworICAgIHZhbHVlLT5zZXRCb29sKCJodHRwT25s eSIsIGNvb2tpZS5odHRwT25seSk7CisgICAgdmFsdWUtPnNldEJvb2woInNlY3VyZSIsIGNvb2tp ZS5zZWN1cmUpOworICAgIHZhbHVlLT5zZXRCb29sKCJzZXNzaW9uIiwgY29va2llLnNlc3Npb24p OwogICAgIHJldHVybiB2YWx1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5oCmluZGV4IDYyNjVhZDI1YWEwYmYwYzRmNTU4Yjg5NGQxZWI5NTcwM2VjYzliZTUuLmJk N2I5OTYxMDJhOTlkOWM4YzNmOGYxN2RjYTY3YjA2MTY3MzViNjAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTMyOCw4ICszMjgsOCBAQCBwcml2YXRlOgogICAg IEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZSogZ2V0RE9NU3RvcmFnZVJlc291cmNlRm9ySWQo bG9uZyBzdG9yYWdlSWQpOwogI2VuZGlmCiAKLSAgICBTY3JpcHRPYmplY3QgYnVpbGRPYmplY3RG b3JDb29raWUoY29uc3QgQ29va2llJik7Ci0gICAgU2NyaXB0QXJyYXkgYnVpbGRBcnJheUZvckNv b2tpZXMoTGlzdEhhc2hTZXQ8Q29va2llPiYpOworICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBidWlsZE9iamVjdEZvckNvb2tpZShjb25zdCBDb29raWUmKTsKKyAgICBQYXNzUmVmUHRy PEluc3BlY3RvckFycmF5PiBidWlsZEFycmF5Rm9yQ29va2llcyhMaXN0SGFzaFNldDxDb29raWU+ Jik7CiAKICAgICB2b2lkIGZvY3VzTm9kZSgpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG cm9udGVuZC5jcHAKaW5kZXggMmU5MjVjMDI0N2ViZTY0ZmRjOWI1MDRkMmE4OGRiNjZhMGFlZmNi OS4uZDQ5MTVlNDhjOGU4YjNkODkyY2EzYTVkMjVhN2E5YmRlYmM4YzZhZSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcApAQCAtMzIsMTkgKzMyLDEyIEBACiAKICNpZiBF TkFCTEUoSU5TUEVDVE9SKQogCi0jaW5jbHVkZSAiRnJhbWUuaCIKLSNpbmNsdWRlICJJbmplY3Rl ZFNjcmlwdC5oIgotI2luY2x1ZGUgIkluamVjdGVkU2NyaXB0SG9zdC5oIgogI2luY2x1ZGUgIklu c3BlY3RvckNsaWVudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckNvbnRyb2xsZXIuaCIKICNpbmNs dWRlICJJbnNwZWN0b3JXb3JrZXJSZXNvdXJjZS5oIgotI2luY2x1ZGUgIk5vZGUuaCIKICNpbmNs dWRlICJTY3JpcHRGdW5jdGlvbkNhbGwuaCIKICNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKICNp bmNsdWRlICJTY3JpcHRTdGF0ZS5oIgotI2luY2x1ZGUgIlNjcmlwdFN0cmluZy5oIgotI2luY2x1 ZGUgIlNjcmlwdFZhbHVlLmgiCi0jaW5jbHVkZSA8d3RmL093blB0ci5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTcxLDE2ICs2NCw2IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6Omlu c3BlY3RlZFBhZ2VEZXN0cm95ZWQoKQogICAgIGZ1bmN0aW9uLmNhbGwoKTsKIH0KIAotU2NyaXB0 QXJyYXkgSW5zcGVjdG9yRnJvbnRlbmQ6Om5ld1NjcmlwdEFycmF5KCkKLXsKLSAgICByZXR1cm4g U2NyaXB0QXJyYXk6OmNyZWF0ZU5ldyhzY3JpcHRTdGF0ZSgpKTsKLX0KLQotU2NyaXB0T2JqZWN0 IEluc3BlY3RvckZyb250ZW5kOjpuZXdTY3JpcHRPYmplY3QoKQotewotICAgIHJldHVybiBTY3Jp cHRPYmplY3Q6OmNyZWF0ZU5ldyhzY3JpcHRTdGF0ZSgpKTsKLX0KLQogdm9pZCBJbnNwZWN0b3JG cm9udGVuZDo6ZGlkQ29tbWl0TG9hZCgpCiB7CiAgICAgY2FsbFNpbXBsZUZ1bmN0aW9uKCJkaWRD b21taXRMb2FkIik7CkBAIC0zMDIsMTUgKzI4NSw2IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6 OnNldFJlY29yZGluZ1Byb2ZpbGUoYm9vbCBpc1Byb2ZpbGluZykKICAgICBmdW5jdGlvbi5hcHBl bmRBcmd1bWVudChpc1Byb2ZpbGluZyk7CiAgICAgZnVuY3Rpb24uY2FsbCgpOwogfQotCi12b2lk IEluc3BlY3RvckZyb250ZW5kOjpkaWRHZXRQcm9maWxlKGxvbmcgY2FsbElkLCBjb25zdCBTY3Jp cHRWYWx1ZSYgcHJvZmlsZSkKLXsKLSAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV93 ZWJJbnNwZWN0b3IsICJkaXNwYXRjaCIpOyAKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudCgi ZGlkR2V0UHJvZmlsZSIpOwotICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGNhbGxJZCk7Ci0g ICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQocHJvZmlsZSk7Ci0gICAgZnVuY3Rpb24uY2FsbCgp OwotfQogI2VuZGlmCiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZFB1c2hOb2RlQnlQYXRo VG9Gcm9udGVuZChsb25nIGNhbGxJZCwgbG9uZyBub2RlSWQpCkBAIC0zNDIsNDMgKzMxNiw2IEBA IHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZERlc3Ryb3lXb3JrZXIoY29uc3QgSW5zcGVjdG9y V29ya2VyUmVzb3VyY2UmIHdvcmtlcikKIH0KICNlbmRpZiAvLyBFTkFCTEUoV09SS0VSUykKIAot dm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6ZGlkR2V0Q29va2llcyhsb25nIGNhbGxJZCwgY29uc3Qg U2NyaXB0QXJyYXkmIGNvb2tpZXMsIGNvbnN0IFN0cmluZyYgY29va2llc1N0cmluZykKLXsKLSAg ICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV93ZWJJbnNwZWN0b3IsICJkaXNwYXRjaCIp OyAKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudCgiZGlkR2V0Q29va2llcyIpOwotICAgIGZ1 bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGNhbGxJZCk7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1l bnQoY29va2llcyk7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoY29va2llc1N0cmluZyk7 Ci0gICAgZnVuY3Rpb24uY2FsbCgpOwotfQotCi0jaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJ Q0FUSU9OUykKLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZEdldEFwcGxpY2F0aW9uQ2FjaGVz KGxvbmcgY2FsbElkLCBjb25zdCBTY3JpcHRWYWx1ZSYgYXBwbGljYXRpb25DYWNoZXMpCi17Ci0g ICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2gi KTsKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudCgiZGlkR2V0QXBwbGljYXRpb25DYWNoZXMi KTsKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChjYWxsSWQpOwotICAgIGZ1bmN0aW9uLmFw cGVuZEFyZ3VtZW50KGFwcGxpY2F0aW9uQ2FjaGVzKTsKLSAgICBmdW5jdGlvbi5jYWxsKCk7Ci19 Ci0KLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnVwZGF0ZUFwcGxpY2F0aW9uQ2FjaGVTdGF0dXMo aW50IHN0YXR1cykKLXsKLSAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV93ZWJJbnNw ZWN0b3IsICJkaXNwYXRjaCIpOyAKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudCgidXBkYXRl QXBwbGljYXRpb25DYWNoZVN0YXR1cyIpOwotICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KHN0 YXR1cyk7Ci0gICAgZnVuY3Rpb24uY2FsbCgpOwotfQotCi12b2lkIEluc3BlY3RvckZyb250ZW5k Ojp1cGRhdGVOZXR3b3JrU3RhdGUoYm9vbCBpc05vd09ubGluZSkKLXsKLSAgICBTY3JpcHRGdW5j dGlvbkNhbGwgZnVuY3Rpb24obV93ZWJJbnNwZWN0b3IsICJkaXNwYXRjaCIpOyAKLSAgICBmdW5j dGlvbi5hcHBlbmRBcmd1bWVudCgidXBkYXRlTmV0d29ya1N0YXRlIik7Ci0gICAgZnVuY3Rpb24u YXBwZW5kQXJndW1lbnQoaXNOb3dPbmxpbmUpOwotICAgIGZ1bmN0aW9uLmNhbGwoKTsKLX0gICAg Ci0jZW5kaWYKLQogdm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6Y29udGV4dE1lbnVJdGVtU2VsZWN0 ZWQoaW50IGl0ZW1JZCkKIHsKICAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV93ZWJJ bnNwZWN0b3IsICJkaXNwYXRjaCIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgK aW5kZXggNjI5YTQwYjIzNjA3OTE2ZjUzYTUzNjNlODNjNTU3NTYwNzFiZjIyMy4uZDdjZWYwNDg1 MjIxMmEzYjhhOTY1YWIwNzc3MTgyYTIzN2Y5ZDc2OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZC5oCkBAIC0zMCwyMSArMzAsMTMgQEAKICNpZm5kZWYgSW5zcGVjdG9yRnJvbnRl bmRfaAogI2RlZmluZSBJbnNwZWN0b3JGcm9udGVuZF9oCiAKLSNpbmNsdWRlICJJbnNwZWN0b3JW YWx1ZXMuaCIKLSNpbmNsdWRlICJTY3JpcHRBcnJheS5oIgogI2luY2x1ZGUgIlNjcmlwdE9iamVj dC5oIgogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIu aD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewotICAgIGNsYXNzIENvbnNvbGVNZXNzYWdlOwotICAg IGNsYXNzIEZyYW1lOwogICAgIGNsYXNzIEluc3BlY3RvckNsaWVudDsKLSAgICBjbGFzcyBJbnNw ZWN0b3JSZXNvdXJjZTsKICAgICBjbGFzcyBJbnNwZWN0b3JXb3JrZXJSZXNvdXJjZTsKLSAgICBj bGFzcyBOb2RlOwotICAgIGNsYXNzIFNjcmlwdFN0cmluZzsKLSAgICBjbGFzcyBTdG9yYWdlOwog CiAgICAgY2xhc3MgSW5zcGVjdG9yRnJvbnRlbmQgOiBwdWJsaWMgTm9uY29weWFibGUgewogICAg IHB1YmxpYzoKQEAgLTU3LDkgKzQ5LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2 b2lkIGNsb3NlKCk7CiAgICAgICAgIHZvaWQgaW5zcGVjdGVkUGFnZURlc3Ryb3llZCgpOwogCi0g ICAgICAgIFNjcmlwdEFycmF5IG5ld1NjcmlwdEFycmF5KCk7Ci0gICAgICAgIFNjcmlwdE9iamVj dCBuZXdTY3JpcHRPYmplY3QoKTsKLQogICAgICAgICB2b2lkIGRpZENvbW1pdExvYWQoKTsKIAog ICAgICAgICB2b2lkIHBvcHVsYXRlQXBwbGljYXRpb25TZXR0aW5ncyhjb25zdCBTdHJpbmcmIHNl dHRpbmdzKTsKQEAgLTk5LDEzICs4OCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg dm9pZCBwcm9maWxlcldhc0VuYWJsZWQoKTsKICAgICAgICAgdm9pZCBwcm9maWxlcldhc0Rpc2Fi bGVkKCk7CiAgICAgICAgIHZvaWQgc2V0UmVjb3JkaW5nUHJvZmlsZShib29sIGlzUHJvZmlsaW5n KTsKLSAgICAgICAgdm9pZCBkaWRHZXRQcm9maWxlKGxvbmcgY2FsbElkLCBjb25zdCBTY3JpcHRW YWx1ZSYgcHJvZmlsZSk7Ci0jZW5kaWYKLQotI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNB VElPTlMpCi0gICAgICAgIHZvaWQgdXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1cyhpbnQgc3Rh dHVzKTsKLSAgICAgICAgdm9pZCB1cGRhdGVOZXR3b3JrU3RhdGUoYm9vbCBpc05vd09ubGluZSk7 Ci0gICAgICAgIHZvaWQgZGlkR2V0QXBwbGljYXRpb25DYWNoZXMobG9uZyBjYWxsSWQsIGNvbnN0 IFNjcmlwdFZhbHVlJiBhcHBsaWNhdGlvbkNhY2hlcyk7CiAjZW5kaWYKIAogICAgICAgICB2b2lk IGRpZFB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChsb25nIGNhbGxJZCwgbG9uZyBub2RlSWQpOwpA QCAtMTE4LDggKzEwMCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBkaWRE ZXN0cm95V29ya2VyKGNvbnN0IEluc3BlY3RvcldvcmtlclJlc291cmNlJik7CiAjZW5kaWYgLy8g RU5BQkxFKFdPUktFUikKIAotICAgICAgICB2b2lkIGRpZEdldENvb2tpZXMobG9uZyBjYWxsSWQs IGNvbnN0IFNjcmlwdEFycmF5JiBjb29raWVzLCBjb25zdCBTdHJpbmcmIGNvb2tpZXNTdHJpbmcp OwotCiAgICAgICAgIHZvaWQgY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoaW50IGl0ZW1JZCk7CiAg ICAgICAgIHZvaWQgY29udGV4dE1lbnVDbGVhcmVkKCk7CiAK