89198 2012-06-15 05:25:09 -0700 Web Inspector: too many hardcoded strings in InspectorBackendDispatcher. 2022-03-01 03:04:53 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo webkit-unassigned alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr prybin rik timothy yurys oldest_to_newest 650094 0 loislo 2012-06-15 05:25:09 -0700 EOM 663768 1 150997 prybin 2012-07-05 16:19:19 -0700 Created attachment 150997 Patch 663898 2 150997 yurys 2012-07-05 23:17:27 -0700 Comment on attachment 150997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150997&action=review > Source/WebCore/inspector/CodeGeneratorInspector.py:1981 > + size_t length = ARRAY_SIZE(commandNames); It should be WTF_ARRAY_LENGTH(commandNames), not sure why compiler didn't complain about it. Is ARRAY_SIZE defined somewhere in WebKit, I only see 2 places (http://code.google.com/p/chromium/source/search?q=define%5CsARRAY_SIZE+file%3AWebKit&origq=define%5CsARRAY_SIZE+file%3AWebKit&btnG=Search+Trunk), none of which should be visible here? 668821 3 152207 prybin 2012-07-13 03:37:25 -0700 Created attachment 152207 Patch 668824 4 150997 prybin 2012-07-13 03:44:06 -0700 Comment on attachment 150997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150997&action=review >> Source/WebCore/inspector/CodeGeneratorInspector.py:1981 >> + size_t length = ARRAY_SIZE(commandNames); > > It should be WTF_ARRAY_LENGTH(commandNames), not sure why compiler didn't complain about it. Is ARRAY_SIZE defined somewhere in WebKit, I only see 2 places (http://code.google.com/p/chromium/source/search?q=define%5CsARRAY_SIZE+file%3AWebKit&origq=define%5CsARRAY_SIZE+file%3AWebKit&btnG=Search+Trunk), none of which should be visible here? Actually I made my own -- didn't know the right name for search. Replaced. 669011 5 loislo 2012-07-13 07:30:30 -0700 Committed r122574: <http://trac.webkit.org/changeset/122574> 150997 2012-07-05 16:19:19 -0700 2022-03-01 03:04:53 -0800 Patch bug-89198-20120706031917.patch text/plain 5596 prybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxOTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBjYjRiZDNkMTIyZmYy YjBiYjllNDRmYmM5Y2M0OGNlMGE2NjVjNS4uOTZkOTk0NjcxMTcyZWY0ZjQ1YjBiMWVhNGE3NjY1 ZTg1NjNkZGVjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA3LTA1ICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiB0b28gbWFueSBoYXJkY29kZWQgc3RyaW5ncyBpbiBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hl ci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MTk4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVh ZCBvZiBnZW5lcmF0aW5nIGVycm9yIG1lc3NhZ2Ugc3RyaW5nIG9uIGV2ZXJ5IGNhbGwgKG1vc3Rs eSBmb3Igbm90aGluZyksCisgICAgICAgIGVycm9yIG1lc3NhZ2UgaXMgZ2VuZXJhdGVkIGRlZXBl ciBpbnNpZGUgdGhlIGhhbmRsZXIgYW5kIG9ubHkgY29tbWFuZCBuYW1lCisgICAgICAgIGlzIHBh c3NlZCBldmVyeSB0aW1lLgorCisgICAgICAgICogaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNw ZWN0b3IucHk6CisgICAgICAgIChHZW5lcmF0b3IucHJvY2Vzc19jb21tYW5kKToKKwogMjAxMi0w Ny0wNSAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29tPgogCiAgICAgICAg IENvZGUgcmVmYWN0b3Jpbmc6IG1vdmUgbWltZVR5cGVGcm9tVVRJVHJlZSB0byBhIHNlcGFyYXRl IGZpbGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRv ckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5z cGVjdG9yLnB5CmluZGV4IDM2NzQ0MDY2MjViYjY3NzA1NWRhZTUxMGYyMDA0MTJjZWRiMjc2MjUu LmNmZWJjOTU0ZTg3MjIxMzk2ODJiZjEzOWU0ZGUzZGZhZWZiNzhhZjUgMTAwNzU1Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBAIC0xNzky LDcgKzE3OTIsNyBAQCAkbWV0aG9kSW5Db2RlCiAgICAgICAgIGlmICghZXJyb3IubGVuZ3RoKCkp IHsKICR7cmVzcG9uc2VDb29rfSAgICAgICAgfQogICAgIH0KLSAgICBzZW5kUmVzcG9uc2UoY2Fs bElkLCByZXN1bHQsIFN0cmluZzo6Zm9ybWF0KCJTb21lIGFyZ3VtZW50cyBvZiBtZXRob2QgJyVz JyBjYW4ndCBiZSBwcm9jZXNzZWQiLCAiJGRvbWFpbk5hbWUuJG1ldGhvZE5hbWUiKSwgcHJvdG9j b2xFcnJvcnMsIGVycm9yKTsKKyAgICBzZW5kUmVzcG9uc2UoY2FsbElkLCByZXN1bHQsIGNvbW1h bmROYW1lc1skY29tbWFuZE5hbWVJbmRleF0sIHByb3RvY29sRXJyb3JzLCBlcnJvcik7CiB9CiAi IiIpCiAKQEAgLTE4ODcsNiArMTg4Nyw4IEBAICR2aXJ0dWFsU2V0dGVycwogCiAgICAgZW51bSBN ZXRob2ROYW1lcyB7CiAkbWV0aG9kTmFtZXNFbnVtQ29udGVudAorCisgICAgICAgIGtNZXRob2RO YW1lc0VudW1TaXplCiAgICAgfTsKIAogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb21tYW5kTmFt ZXNbXTsKQEAgLTE5MTQsNiArMTkxNiw4IEBAICRtZXRob2ROYW1lc0VudW1Db250ZW50CiAjaW5j bHVkZSAiSW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvV1RG U3RyaW5nLmg+CiAKKyNkZWZpbmUgQVJSQVlfU0laRShhKSAoc2l6ZW9mKGEpIC8gc2l6ZW9mKChh KVswXSkpCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY29uc3QgY2hhciogSW5zcGVjdG9yQmFj a2VuZERpc3BhdGNoZXI6OmNvbW1hbmROYW1lc1tdID0gewpAQCAtMTk1MCw3ICsxOTU0LDcgQEAg JGZpZWxkRGVjbGFyYXRpb25zCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiBnZXRPYmplY3QoSW5zcGVjdG9yT2JqZWN0KiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwg Ym9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yQXJyYXkqIHByb3RvY29sRXJyb3JzKTsKICAgICBz dGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gZ2V0QXJyYXkoSW5zcGVjdG9yT2JqZWN0 KiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9y QXJyYXkqIHByb3RvY29sRXJyb3JzKTsKIAotICAgIHZvaWQgc2VuZFJlc3BvbnNlKGxvbmcgY2Fs bElkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVzdWx0LCBjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gcHJvdG9jb2xFcnJvcnMsIEVy cm9yU3RyaW5nIGludm9jYXRpb25FcnJvcik7CisgICAgdm9pZCBzZW5kUmVzcG9uc2UobG9uZyBj YWxsSWQsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXN1bHQsIGNvbnN0IGNoYXIqIGNv bW1hbmROYW1lLCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBwcm90b2NvbEVycm9ycywgRXJy b3JTdHJpbmcgaW52b2NhdGlvbkVycm9yKTsKIAogfTsKIApAQCAtMTk3NCw3ICsxOTc4LDcgQEAg dm9pZCBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlckltcGw6OmRpc3BhdGNoKGNvbnN0IFN0cmlu ZyYgbWVzc2FnZSkKICAgICAgICAgc3RhdGljIENhbGxIYW5kbGVyIGhhbmRsZXJzW10gPSB7CiAk bWVzc2FnZUhhbmRsZXJzCiAgICAgICAgIH07Ci0gICAgICAgIHNpemVfdCBsZW5ndGggPSBzaXpl b2YoY29tbWFuZE5hbWVzKSAvIHNpemVvZihjb21tYW5kTmFtZXNbMF0pOworICAgICAgICBzaXpl X3QgbGVuZ3RoID0gQVJSQVlfU0laRShjb21tYW5kTmFtZXMpOwogICAgICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQogICAgICAgICAgICAgZGlzcGF0Y2hNYXAuYWRkKGNv bW1hbmROYW1lc1tpXSwgaGFuZGxlcnNbaV0pOwogICAgIH0KQEAgLTIwMjMsOSArMjAyNywxMCBA QCAkbWVzc2FnZUhhbmRsZXJzCiAgICAgKCgqdGhpcykuKml0LT5zZWNvbmQpKGNhbGxJZCwgbWVz c2FnZU9iamVjdC5nZXQoKSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJJ bXBsOjpzZW5kUmVzcG9uc2UobG9uZyBjYWxsSWQsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiByZXN1bHQsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlLCBQYXNzUmVmUHRyPEluc3BlY3Rv ckFycmF5PiBwcm90b2NvbEVycm9ycywgRXJyb3JTdHJpbmcgaW52b2NhdGlvbkVycm9yKQordm9p ZCBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlckltcGw6OnNlbmRSZXNwb25zZShsb25nIGNhbGxJ ZCwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc3VsdCwgY29uc3QgY2hhciogY29tbWFu ZE5hbWUsIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHByb3RvY29sRXJyb3JzLCBFcnJvclN0 cmluZyBpbnZvY2F0aW9uRXJyb3IpCiB7CiAgICAgaWYgKHByb3RvY29sRXJyb3JzLT5sZW5ndGgo KSkgeworICAgICAgICBTdHJpbmcgZXJyb3JNZXNzYWdlID0gU3RyaW5nOjpmb3JtYXQoIlNvbWUg YXJndW1lbnRzIG9mIG1ldGhvZCAnJXMnIGNhbid0IGJlIHByb2Nlc3NlZCIsIGNvbW1hbmROYW1l KTsKICAgICAgICAgcmVwb3J0UHJvdG9jb2xFcnJvcigmY2FsbElkLCBJbnZhbGlkUGFyYW1zLCBl cnJvck1lc3NhZ2UsIHByb3RvY29sRXJyb3JzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAg LTIxNjYsNiArMjE3MSw3IEBAIGJvb2wgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldENv bW1hbmROYW1lKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgU3RyaW5nKiByCiAgICAgcmV0dXJuIHRy dWU7CiB9CiAKK0NPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oSW5zcGVjdG9yQmFja2Vu ZERpc3BhdGNoZXI6OmtNZXRob2ROYW1lc0VudW1TaXplKSA9PSBBUlJBWV9TSVpFKEluc3BlY3Rv ckJhY2tlbmREaXNwYXRjaGVyOjpjb21tYW5kTmFtZXMpLCBjb21tYW5kX25hbWVfYXJyYXlfcHJv YmxlbSk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApAQCAtMjY4NSw3ICsyNjkxLDkgQEAg Y2xhc3MgR2VuZXJhdG9yOgogICAgIGRlZiBwcm9jZXNzX2NvbW1hbmQoanNvbl9jb21tYW5kLCBk b21haW5fbmFtZSwgYWdlbnRfZmllbGRfbmFtZSwgYWdlbnRfaW50ZXJmYWNlX25hbWUpOgogICAg ICAgICBqc29uX2NvbW1hbmRfbmFtZSA9IGpzb25fY29tbWFuZFsibmFtZSJdCiAKLSAgICAgICAg R2VuZXJhdG9yLm1ldGhvZF9uYW1lX2VudW1fbGlzdC5hcHBlbmQoIiAgICAgICAgayVzXyVzQ21k LCIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZFsibmFtZSJdKSkKKyAgICAgICAgY21kX2Vu dW1fbmFtZSA9ICJrJXNfJXNDbWQiICUgKGRvbWFpbl9uYW1lLCBqc29uX2NvbW1hbmRbIm5hbWUi XSkKKworICAgICAgICBHZW5lcmF0b3IubWV0aG9kX25hbWVfZW51bV9saXN0LmFwcGVuZCgiICAg ICAgICAlcywiICUgY21kX2VudW1fbmFtZSkKICAgICAgICAgR2VuZXJhdG9yLm1ldGhvZF9oYW5k bGVyX2xpc3QuYXBwZW5kKCIgICAgICAgICAgICAmSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJJ bXBsOjolc18lcywiICUgKGRvbWFpbl9uYW1lLCBqc29uX2NvbW1hbmRfbmFtZSkpCiAgICAgICAg IEdlbmVyYXRvci5iYWNrZW5kX21ldGhvZF9kZWNsYXJhdGlvbl9saXN0LmFwcGVuZCgiICAgIHZv aWQgJXNfJXMobG9uZyBjYWxsSWQsIEluc3BlY3Rvck9iamVjdCogcmVxdWVzdE1lc3NhZ2VPYmpl Y3QpOyIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZF9uYW1lKSkKIApAQCAtMjgxMSw3ICsy ODE5LDggQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgbWV0aG9kT3V0Q29kZT1tZXRo b2Rfb3V0X2NvZGUsCiAgICAgICAgICAgICBhZ2VudENhbGxQYXJhbXM9am9pbihhZ2VudF9jYWxs X3BhcmFtX2xpc3QsICIiKSwKICAgICAgICAgICAgIHJlcXVlc3RNZXNzYWdlT2JqZWN0PXJlcXVl c3RfbWVzc2FnZV9wYXJhbSwKLSAgICAgICAgICAgIHJlc3BvbnNlQ29vaz1yZXNwb25zZV9jb29r X3RleHQpKQorICAgICAgICAgICAgcmVzcG9uc2VDb29rPXJlc3BvbnNlX2Nvb2tfdGV4dCwKKyAg ICAgICAgICAgIGNvbW1hbmROYW1lSW5kZXg9Y21kX2VudW1fbmFtZSkpCiAgICAgICAgIEdlbmVy YXRvci5iYWNrZW5kX21ldGhvZF9uYW1lX2RlY2xhcmF0aW9uX2xpc3QuYXBwZW5kKCIgICAgXCIl cy4lc1wiLCIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZF9uYW1lKSkKIAogICAgICAgICBH ZW5lcmF0b3IuYmFja2VuZF9qc19kb21haW5faW5pdGlhbGl6ZXJfbGlzdC5hcHBlbmQoIkluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKFwiJXMuJXNcIiwgWyVzXSwgJXMpO1xuIiAlIChk b21haW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUsIGpzX3BhcmFtZXRlcnNfdGV4dCwganNfcmVw bHlfbGlzdCkpCg== 152207 2012-07-13 03:37:25 -0700 2012-07-15 21:49:30 -0700 Patch bug-89198-20120713143723.patch text/plain 5318 prybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGUwMTc0YjgwOWQzYjRk NjRhZDZlZThkYjczZTBmM2ExOWE0M2JlNS4uNmE5N2E4YzNiNjk4YmM1MzZjMTY1NmRlZGYwNTEz MWExNTNmZDM4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA3LTEzICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiB0b28gbWFueSBoYXJkY29kZWQgc3RyaW5ncyBpbiBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hl ci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MTk4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVh ZCBvZiBnZW5lcmF0aW5nIGVycm9yIG1lc3NhZ2Ugc3RyaW5nIG9uIGV2ZXJ5IGNhbGwgKG1vc3Rs eSBmb3Igbm90aGluZyksCisgICAgICAgIGVycm9yIG1lc3NhZ2UgaXMgZ2VuZXJhdGVkIGRlZXBl ciBpbnNpZGUgdGhlIGhhbmRsZXIgYW5kIG9ubHkgY29tbWFuZCBuYW1lCisgICAgICAgIGlzIHBh c3NlZCBldmVyeSB0aW1lLgorCisgICAgICAgICogaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNw ZWN0b3IucHk6CisgICAgICAgIChHZW5lcmF0b3IucHJvY2Vzc19jb21tYW5kKToKKwogMjAxMi0w Ny0xMyAgRG9uZ3dvbyBJbSAgPGR3LmltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIENvZGVHZW5l cmF0b3JKUy5wbSA6IFNldHRlckV4cHJlc3Npb24gc2hvdWxkIHVzZSAncHVzaCcgcmF0aGVyIHRo YW4gJ3Vuc2hpZnQnCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdl bmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJh dG9ySW5zcGVjdG9yLnB5CmluZGV4IDA1ZDNmODBjNzRiMmM1ZDkxZDY2NDlhMWRmZjhmZGZlOGM4 YTIxNDkuLmIzYTVmNDE1MTlkYzFlMjU1YjY0Zjg5NTZkOWRiYjVjYzAzYmMyYWEgMTAwNzU1Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5Cisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBA IC0xNzkxLDcgKzE3OTEsNyBAQCAkbWV0aG9kSW5Db2RlCiAKICR7cmVzcG9uc2VDb29rfQogICAg IH0KLSAgICBzZW5kUmVzcG9uc2UoY2FsbElkLCByZXN1bHQsIFN0cmluZzo6Zm9ybWF0KCJTb21l IGFyZ3VtZW50cyBvZiBtZXRob2QgJyVzJyBjYW4ndCBiZSBwcm9jZXNzZWQiLCAiJGRvbWFpbk5h bWUuJG1ldGhvZE5hbWUiKSwgcHJvdG9jb2xFcnJvcnMsIGVycm9yKTsKKyAgICBzZW5kUmVzcG9u c2UoY2FsbElkLCByZXN1bHQsIGNvbW1hbmROYW1lc1skY29tbWFuZE5hbWVJbmRleF0sIHByb3Rv Y29sRXJyb3JzLCBlcnJvcik7CiB9CiAiIiIpCiAKQEAgLTE4ODYsNiArMTg4Niw4IEBAICR2aXJ0 dWFsU2V0dGVycwogCiAgICAgZW51bSBNZXRob2ROYW1lcyB7CiAkbWV0aG9kTmFtZXNFbnVtQ29u dGVudAorCisgICAgICAgIGtNZXRob2ROYW1lc0VudW1TaXplCiAgICAgfTsKIAogICAgIHN0YXRp YyBjb25zdCBjaGFyKiBjb21tYW5kTmFtZXNbXTsKQEAgLTE5NDksNyArMTk1MSw3IEBAICRmaWVs ZERlY2xhcmF0aW9ucwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZ2V0 T2JqZWN0KEluc3BlY3Rvck9iamVjdCogb2JqZWN0LCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wq IHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5KiBwcm90b2NvbEVycm9ycyk7CiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGdldEFycmF5KEluc3BlY3Rvck9iamVjdCogb2Jq ZWN0LCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5 KiBwcm90b2NvbEVycm9ycyk7CiAKLSAgICB2b2lkIHNlbmRSZXNwb25zZShsb25nIGNhbGxJZCwg UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc3VsdCwgY29uc3QgU3RyaW5nJiBlcnJvck1l c3NhZ2UsIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHByb3RvY29sRXJyb3JzLCBFcnJvclN0 cmluZyBpbnZvY2F0aW9uRXJyb3IpOworICAgIHZvaWQgc2VuZFJlc3BvbnNlKGxvbmcgY2FsbElk LCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVzdWx0LCBjb25zdCBjaGFyKiBjb21tYW5k TmFtZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gcHJvdG9jb2xFcnJvcnMsIEVycm9yU3Ry aW5nIGludm9jYXRpb25FcnJvcik7CiAKIH07CiAKQEAgLTE5NzMsNyArMTk3NSw3IEBAIHZvaWQg SW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJJbXBsOjpkaXNwYXRjaChjb25zdCBTdHJpbmcmIG1l c3NhZ2UpCiAgICAgICAgIHN0YXRpYyBDYWxsSGFuZGxlciBoYW5kbGVyc1tdID0gewogJG1lc3Nh Z2VIYW5kbGVycwogICAgICAgICB9OwotICAgICAgICBzaXplX3QgbGVuZ3RoID0gc2l6ZW9mKGNv bW1hbmROYW1lcykgLyBzaXplb2YoY29tbWFuZE5hbWVzWzBdKTsKKyAgICAgICAgc2l6ZV90IGxl bmd0aCA9IFdURl9BUlJBWV9MRU5HVEgoY29tbWFuZE5hbWVzKTsKICAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkKICAgICAgICAgICAgIGRpc3BhdGNoTWFwLmFkZChj b21tYW5kTmFtZXNbaV0sIGhhbmRsZXJzW2ldKTsKICAgICB9CkBAIC0yMDIyLDkgKzIwMjQsMTAg QEAgJG1lc3NhZ2VIYW5kbGVycwogICAgICgoKnRoaXMpLippdC0+c2Vjb25kKShjYWxsSWQsIG1l c3NhZ2VPYmplY3QuZ2V0KCkpOwogfQogCi12b2lkIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVy SW1wbDo6c2VuZFJlc3BvbnNlKGxvbmcgY2FsbElkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gcmVzdWx0LCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgUGFzc1JlZlB0cjxJbnNwZWN0 b3JBcnJheT4gcHJvdG9jb2xFcnJvcnMsIEVycm9yU3RyaW5nIGludm9jYXRpb25FcnJvcikKK3Zv aWQgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJJbXBsOjpzZW5kUmVzcG9uc2UobG9uZyBjYWxs SWQsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXN1bHQsIGNvbnN0IGNoYXIqIGNvbW1h bmROYW1lLCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBwcm90b2NvbEVycm9ycywgRXJyb3JT dHJpbmcgaW52b2NhdGlvbkVycm9yKQogewogICAgIGlmIChwcm90b2NvbEVycm9ycy0+bGVuZ3Ro KCkpIHsKKyAgICAgICAgU3RyaW5nIGVycm9yTWVzc2FnZSA9IFN0cmluZzo6Zm9ybWF0KCJTb21l IGFyZ3VtZW50cyBvZiBtZXRob2QgJyVzJyBjYW4ndCBiZSBwcm9jZXNzZWQiLCBjb21tYW5kTmFt ZSk7CiAgICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoJmNhbGxJZCwgSW52YWxpZFBhcmFtcywg ZXJyb3JNZXNzYWdlLCBwcm90b2NvbEVycm9ycyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC0yMTY1LDYgKzIxNjgsNyBAQCBib29sIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRD b21tYW5kTmFtZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFN0cmluZyogcgogICAgIHJldHVybiB0 cnVlOwogfQogCitDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KEluc3BlY3RvckJhY2tl bmREaXNwYXRjaGVyOjprTWV0aG9kTmFtZXNFbnVtU2l6ZSkgPT0gV1RGX0FSUkFZX0xFTkdUSChJ bnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Y29tbWFuZE5hbWVzKSwgY29tbWFuZF9uYW1lX2Fy cmF5X3Byb2JsZW0pOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKQEAgLTI2ODQsNyArMjY4 OCw5IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICBkZWYgcHJvY2Vzc19jb21tYW5kKGpzb25fY29t bWFuZCwgZG9tYWluX25hbWUsIGFnZW50X2ZpZWxkX25hbWUsIGFnZW50X2ludGVyZmFjZV9uYW1l KToKICAgICAgICAganNvbl9jb21tYW5kX25hbWUgPSBqc29uX2NvbW1hbmRbIm5hbWUiXQogCi0g ICAgICAgIEdlbmVyYXRvci5tZXRob2RfbmFtZV9lbnVtX2xpc3QuYXBwZW5kKCIgICAgICAgIGsl c18lc0NtZCwiICUgKGRvbWFpbl9uYW1lLCBqc29uX2NvbW1hbmRbIm5hbWUiXSkpCisgICAgICAg IGNtZF9lbnVtX25hbWUgPSAiayVzXyVzQ21kIiAlIChkb21haW5fbmFtZSwganNvbl9jb21tYW5k WyJuYW1lIl0pCisKKyAgICAgICAgR2VuZXJhdG9yLm1ldGhvZF9uYW1lX2VudW1fbGlzdC5hcHBl bmQoIiAgICAgICAgJXMsIiAlIGNtZF9lbnVtX25hbWUpCiAgICAgICAgIEdlbmVyYXRvci5tZXRo b2RfaGFuZGxlcl9saXN0LmFwcGVuZCgiICAgICAgICAgICAgJkluc3BlY3RvckJhY2tlbmREaXNw YXRjaGVySW1wbDo6JXNfJXMsIiAlIChkb21haW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUpKQog ICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9tZXRob2RfZGVjbGFyYXRpb25fbGlzdC5hcHBlbmQo IiAgICB2b2lkICVzXyVzKGxvbmcgY2FsbElkLCBJbnNwZWN0b3JPYmplY3QqIHJlcXVlc3RNZXNz YWdlT2JqZWN0KTsiICUgKGRvbWFpbl9uYW1lLCBqc29uX2NvbW1hbmRfbmFtZSkpCiAKQEAgLTI4 MTMsNyArMjgxOSw4IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICAgICAgICAgIG1ldGhvZE91dENv ZGU9bWV0aG9kX291dF9jb2RlLAogICAgICAgICAgICAgYWdlbnRDYWxsUGFyYW1zPWpvaW4oYWdl bnRfY2FsbF9wYXJhbV9saXN0LCAiIiksCiAgICAgICAgICAgICByZXF1ZXN0TWVzc2FnZU9iamVj dD1yZXF1ZXN0X21lc3NhZ2VfcGFyYW0sCi0gICAgICAgICAgICByZXNwb25zZUNvb2s9cmVzcG9u c2VfY29va190ZXh0KSkKKyAgICAgICAgICAgIHJlc3BvbnNlQ29vaz1yZXNwb25zZV9jb29rX3Rl eHQsCisgICAgICAgICAgICBjb21tYW5kTmFtZUluZGV4PWNtZF9lbnVtX25hbWUpKQogICAgICAg ICBHZW5lcmF0b3IuYmFja2VuZF9tZXRob2RfbmFtZV9kZWNsYXJhdGlvbl9saXN0LmFwcGVuZCgi ICAgIFwiJXMuJXNcIiwiICUgKGRvbWFpbl9uYW1lLCBqc29uX2NvbW1hbmRfbmFtZSkpCiAKICAg ICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfanNfZG9tYWluX2luaXRpYWxpemVyX2xpc3QuYXBwZW5k KCJJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZChcIiVzLiVzXCIsIFslc10sICVzKTtc biIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZF9uYW1lLCBqc19wYXJhbWV0ZXJzX3RleHQs IGpzX3JlcGx5X2xpc3QpKQo=