108611 2013-02-01 03:53:08 -0800 Web Inspector: Refactor InspectorDOMStorageAgent::getDOMStorageEntries to report the error messages 2013-02-02 04:56:11 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vivekg vivek.vg apavlov keishi loislo pfeldman pmuellr vivek.vg vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 822589 0 vivekg 2013-02-01 03:53:08 -0800 Refactor InspectorDOMStorageAgent::getDOMStorageEntries to report the error messages. Patch follows. 822593 1 186004 vivek.vg 2013-02-01 03:59:43 -0800 Created attachment 186004 Patch 822605 2 186004 apavlov 2013-02-01 04:15:52 -0800 Comment on attachment 186004 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186004&action=review > Source/WebCore/inspector/InspectorDOMStorageAgent.cpp:116 > + *errorString = "Storage resource not found for the provided storage Id"; id -> identifier > Source/WebCore/inspector/InspectorDOMStorageAgent.cpp:132 > + if (ec) { Does this (and below) check structure mean you bail out of the method without providing any errorString for the other ec values? You have retained the pre-existing behavior for the other cases, but the code was unable to provide ANY errorString previously :) > Source/WebCore/inspector/InspectorDOMStorageAgent.cpp:133 > + switch (ec) { Not quite sure, but I remember some compilers complain about not all the enum cases being handled if not all of them are enumerated and the switch does not contain the "default:" case. 822606 3 186004 yurys 2013-02-01 04:16:54 -0800 Comment on attachment 186004 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186004&action=review > Source/WebCore/inspector/InspectorDOMStorageAgent.cpp:126 > + entries = TypeBuilder::Array<TypeBuilder::Array<String> >::create(); You shouldn't write to the output parameters partial results in cases there is an error below. You can use local variable to collect the entries and on success assign it to |entries| after the loop below. > Source/WebCore/inspector/InspectorDOMStorageAgent.cpp:136 > + break; Is it the only type of error? If not you should either process all cases or add default: section here providing some generic error message. > Source/WebCore/inspector/InspectorDOMStorageAgent.cpp:145 > + *errorString = "Security error"; ditto, also consider extracting the error handling into a separate function: if (hadException(ec, errorString)) return; 823413 4 186182 vivek.vg 2013-02-01 16:21:23 -0800 Created attachment 186182 Patch 823627 5 186182 vivek.vg 2013-02-02 04:52:41 -0800 Comment on attachment 186182 Patch Thank you! 823629 6 186182 webkit.review.bot 2013-02-02 04:56:08 -0800 Comment on attachment 186182 Patch Clearing flags on attachment: 186182 Committed r141690: <http://trac.webkit.org/changeset/141690> 823630 7 webkit.review.bot 2013-02-02 04:56:11 -0800 All reviewed patches have been landed. Closing bug. 186004 2013-02-01 03:59:43 -0800 2013-02-01 16:21:19 -0800 Patch bug-108611-20130201172725.patch text/plain 3381 vivek.vg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjY5YzYyYzM2MWIxODhh NjUyMGU1MzIwOWQ3ZmQxZDQwNmQ1NzI1OS4uMGVhZWI2ZTNhOWZjNzQyM2FiY2YyMjcwNzdlYWQ1 MjEyYzBiMmJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTAxICBWaXZl ayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1bmcuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlZmFjdG9yIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUVudHJp ZXMgdG8gcmVwb3J0IHRoZSBlcnJvciBtZXNzYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NjExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTW92aW5nIHRoZSBhcnJheSBjcmVhdGlvbiBhZnRlciB0 aGUgZXJyb3IgY29uZGl0aW9uIGNoZWNrcyB0byBhdm9pZCB0aGUgZWFybHkgYmFpbG91dHMuCisg ICAgICAgIEFsc28gcmVwb3J0aW5nIGFib3V0IHRoZSBFcnJvckNvZGUgaGFuZGxpbmcgZnJvbSB0 aGUgZXJyb3JzIHJlcG9ydGVkIGJ5IHRoZSBTdG9yYWdlQXJlYS4KKworICAgICAgICBObyBuZXcg dGVzdHMgYXMgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JET01TdG9yYWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3Rv cmFnZUFnZW50OjpnZXRET01TdG9yYWdlRW50cmllcyk6CisKIDIwMTMtMDItMDEgIEphZSBIeXVu IFBhcmsgIDxqYWUucGFya0Bjb21wYW55MTAwLm5ldD4KIAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwCmluZGV4IDg0MzNh NmQxNzY3ZWEwMzNkNWU5NWI5MWM0ZjMzNTk4MGVkYmE5NmIuLjQ1NjdlOWRjYTc2NGE0OTNlYjE5 MjJhN2M4NWYwNTc5NmQ3NjNiMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwCkBAIC0xMDksMjggKzEwOSw0NSBAQCB2 b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCiAgICAg bV9zdGF0ZS0+c2V0Qm9vbGVhbihET01TdG9yYWdlQWdlbnRTdGF0ZTo6ZG9tU3RvcmFnZUFnZW50 RW5hYmxlZCwgbV9lbmFibGVkKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6 OmdldERPTVN0b3JhZ2VFbnRyaWVzKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzdG9yYWdl SWQsIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4g PiA+JiBlbnRyaWVzKQordm9pZCBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OmdldERPTVN0b3Jh Z2VFbnRyaWVzKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBzdG9yYWdl SWQsIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4g PiA+JiBlbnRyaWVzKQogewotICAgIC8vIEZJWE1FOiBjb25zaWRlciBpbml0aWFsaXppbmcgdGhp cyBhcnJheSBhZnRlciAyIGNoZWNrcyBiZWxvdy4gVGhlIGNoZWNrcyBzaG91bGQgcmV0dXJuIGVy cm9yIG1lc3NhZ2VzIGluIHRoaXMgY2FzZS4KLSAgICBlbnRyaWVzID0gVHlwZUJ1aWxkZXI6OkFy cmF5PFR5cGVCdWlsZGVyOjpBcnJheTxTdHJpbmc+ID46OmNyZWF0ZSgpOwotCiAgICAgSW5zcGVj dG9yRE9NU3RvcmFnZVJlc291cmNlKiBzdG9yYWdlUmVzb3VyY2UgPSBnZXRET01TdG9yYWdlUmVz b3VyY2VGb3JJZChzdG9yYWdlSWQpOwotICAgIGlmICghc3RvcmFnZVJlc291cmNlKQorICAgIGlm ICghc3RvcmFnZVJlc291cmNlKSB7CisgICAgICAgICplcnJvclN0cmluZyA9ICJTdG9yYWdlIHJl c291cmNlIG5vdCBmb3VuZCBmb3IgdGhlIHByb3ZpZGVkIHN0b3JhZ2UgSWQiOwogICAgICAgICBy ZXR1cm47CisgICAgfQorCiAgICAgRnJhbWUqIGZyYW1lID0gc3RvcmFnZVJlc291cmNlLT5mcmFt ZSgpOwotICAgIGlmICghZnJhbWUpCisgICAgaWYgKCFmcmFtZSkgeworICAgICAgICAqZXJyb3JT dHJpbmcgPSAiRnJhbWUgbm90IGZvdW5kIjsKICAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IGVudHJpZXMgPSBUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4g Pjo6Y3JlYXRlKCk7CiAKLSAgICAvLyBGSVhNRTogRXhjZXB0aW9ucyBhcmUgbm90IHJlcG9ydGVk IGhlcmUuCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgU3RvcmFnZUFyZWEqIHN0b3Jh Z2VBcmVhID0gc3RvcmFnZVJlc291cmNlLT5zdG9yYWdlQXJlYSgpOwogICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBzdG9yYWdlQXJlYS0+bGVuZ3RoKGVjLCBmcmFtZSk7ICsraSkgewogICAg ICAgICBTdHJpbmcgbmFtZShzdG9yYWdlQXJlYS0+a2V5KGksIGVjLCBmcmFtZSkpOwotICAgICAg ICBpZiAoZWMpCisgICAgICAgIGlmIChlYykgeworICAgICAgICAgICAgc3dpdGNoIChlYykgewor ICAgICAgICAgICAgY2FzZSBTRUNVUklUWV9FUlI6CisgICAgICAgICAgICAgICAgKmVycm9yU3Ry aW5nID0gIlNlY3VyaXR5IGVycm9yIjsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIFN0cmluZyB2 YWx1ZShzdG9yYWdlQXJlYS0+Z2V0SXRlbShuYW1lLCBlYywgZnJhbWUpKTsKLSAgICAgICAgaWYg KGVjKQorICAgICAgICBpZiAoZWMpIHsKKyAgICAgICAgICAgIHN3aXRjaCAoZWMpIHsKKyAgICAg ICAgICAgIGNhc2UgU0VDVVJJVFlfRVJSOgorICAgICAgICAgICAgICAgICplcnJvclN0cmluZyA9 ICJTZWN1cml0eSBlcnJvciI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICBSZWZQdHI8VHlwZUJ1 aWxkZXI6OkFycmF5PFN0cmluZz4gPiBlbnRyeSA9IFR5cGVCdWlsZGVyOjpBcnJheTxTdHJpbmc+ OjpjcmVhdGUoKTsKICAgICAgICAgZW50cnktPmFkZEl0ZW0obmFtZSk7CiAgICAgICAgIGVudHJ5 LT5hZGRJdGVtKHZhbHVlKTsK 186182 2013-02-01 16:21:23 -0800 2013-02-02 04:56:08 -0800 Patch bug-108611-20130202054804.patch text/plain 4164 vivek.vg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVjNWEwNzAwM2RkMWIx MTcyMDhhMDJiZDM2M2M5MTQ5ZDMwOTVlYy4uNjk4YTkxNDM5YzMyODM1ZGNlNTlkZjM4Mzk3NDVk MmQxZmYxMmM2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTAxICBWaXZl ayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1bmcuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlZmFjdG9yIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUVudHJp ZXMgdG8gcmVwb3J0IHRoZSBlcnJvciBtZXNzYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NjExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcmVwb3J0aW5nIG9mIHZhcmlvdXMgZXJyb3Ig bWVzc2FnZXMuIE1vdmVkIHRoZSBtb2RpZmljYXRpb24gb2Ygb3V0cHV0CisgICAgICAgIHBhcmFt ZXRlciBhdCBhIGxhdGVyIHN0YWdlIHdoZW4gdGhlcmUgYXJlIG5vIGVycm9ycyByZXBvcnRlZC4K KworICAgICAgICBObyBuZXcgdGVzdHMgYXMgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6aGFkRXhjZXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpnZXRET01TdG9yYWdlRW50cmllcyk6CisKIDIwMTMt MDItMDEgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVp bGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TVN0b3JhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N U3RvcmFnZUFnZW50LmNwcAppbmRleCA4NDMzYTZkMTc2N2VhMDMzZDVlOTViOTFjNGYzMzU5ODBl ZGJhOTZiLi45Y2Y4ODc1NTRiZDMxNzliMzYyMzc1YjI2NzBkOWNmZmVkNWNmNDczIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50 LmNwcApAQCAtNTYsNiArNTYsMjAgQEAgbmFtZXNwYWNlIERPTVN0b3JhZ2VBZ2VudFN0YXRlIHsK IHN0YXRpYyBjb25zdCBjaGFyIGRvbVN0b3JhZ2VBZ2VudEVuYWJsZWRbXSA9ICJkb21TdG9yYWdl QWdlbnRFbmFibGVkIjsKIH07CiAKK3N0YXRpYyBib29sIGhhZEV4Y2VwdGlvbihFeGNlcHRpb25D b2RlIGVjLCBFcnJvclN0cmluZyogZXJyb3JTdHJpbmcpCit7CisgICAgc3dpdGNoIChlYykgewor ICAgIGNhc2UgMDoKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGNhc2UgU0VDVVJJVFlfRVJS OgorICAgICAgICAqZXJyb3JTdHJpbmcgPSAiU2VjdXJpdHkgZXJyb3IiOworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICBkZWZhdWx0OgorICAgICAgICAqZXJyb3JTdHJpbmcgPSAiVW5rbm93biBE T00gc3RvcmFnZSBlcnJvciI7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KK30KKwogSW5z cGVjdG9yRE9NU3RvcmFnZUFnZW50OjpJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQoSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5zcGVjdG9yQ29tcG9zaXRlU3RhdGUq IHN0YXRlKQogICAgIDogSW5zcGVjdG9yQmFzZUFnZW50PEluc3BlY3RvckRPTVN0b3JhZ2VBZ2Vu dD4oIkRPTVN0b3JhZ2UiLCBpbnN0cnVtZW50aW5nQWdlbnRzLCBzdGF0ZSkKICAgICAsIG1fZnJv bnRlbmQoMCkKQEAgLTEwOSwzMyArMTIzLDM2IEBAIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50OjpkaXNhYmxlKEVycm9yU3RyaW5nKikKICAgICBtX3N0YXRlLT5zZXRCb29sZWFuKERPTVN0 b3JhZ2VBZ2VudFN0YXRlOjpkb21TdG9yYWdlQWdlbnRFbmFibGVkLCBtX2VuYWJsZWQpOwogfQog Ci12b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUVudHJpZXMoRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHN0b3JhZ2VJZCwgUmVmUHRyPFR5cGVCdWlsZGVyOjpB cnJheTxUeXBlQnVpbGRlcjo6QXJyYXk8U3RyaW5nPiA+ID4mIGVudHJpZXMpCit2b2lkIEluc3Bl Y3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUVudHJpZXMoRXJyb3JTdHJpbmcqIGVy cm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIHN0b3JhZ2VJZCwgUmVmUHRyPFR5cGVCdWlsZGVyOjpB cnJheTxUeXBlQnVpbGRlcjo6QXJyYXk8U3RyaW5nPiA+ID4mIGVudHJpZXMpCiB7Ci0gICAgLy8g RklYTUU6IGNvbnNpZGVyIGluaXRpYWxpemluZyB0aGlzIGFycmF5IGFmdGVyIDIgY2hlY2tzIGJl bG93LiBUaGUgY2hlY2tzIHNob3VsZCByZXR1cm4gZXJyb3IgbWVzc2FnZXMgaW4gdGhpcyBjYXNl LgotICAgIGVudHJpZXMgPSBUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFycmF5PFN0 cmluZz4gPjo6Y3JlYXRlKCk7Ci0KICAgICBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UqIHN0 b3JhZ2VSZXNvdXJjZSA9IGdldERPTVN0b3JhZ2VSZXNvdXJjZUZvcklkKHN0b3JhZ2VJZCk7Ci0g ICAgaWYgKCFzdG9yYWdlUmVzb3VyY2UpCisgICAgaWYgKCFzdG9yYWdlUmVzb3VyY2UpIHsKKyAg ICAgICAgKmVycm9yU3RyaW5nID0gIlN0b3JhZ2UgcmVzb3VyY2Ugbm90IGZvdW5kIGZvciB0aGUg Z2l2ZW4gc3RvcmFnZSBpZGVudGlmaWVyIjsKICAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBG cmFtZSogZnJhbWUgPSBzdG9yYWdlUmVzb3VyY2UtPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkK KyAgICBpZiAoIWZyYW1lKSB7CisgICAgICAgICplcnJvclN0cmluZyA9ICJGcmFtZSBub3QgZm91 bmQiOwogICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgUmVmUHRyPFR5cGVCdWlsZGVyOjpB cnJheTxUeXBlQnVpbGRlcjo6QXJyYXk8U3RyaW5nPiA+ID4gc3RvcmFnZUVudHJpZXMgPSBUeXBl QnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4gPjo6Y3JlYXRlKCk7CiAK LSAgICAvLyBGSVhNRTogRXhjZXB0aW9ucyBhcmUgbm90IHJlcG9ydGVkIGhlcmUuCiAgICAgRXhj ZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgU3RvcmFnZUFyZWEqIHN0b3JhZ2VBcmVhID0gc3RvcmFn ZVJlc291cmNlLT5zdG9yYWdlQXJlYSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBz dG9yYWdlQXJlYS0+bGVuZ3RoKGVjLCBmcmFtZSk7ICsraSkgewogICAgICAgICBTdHJpbmcgbmFt ZShzdG9yYWdlQXJlYS0+a2V5KGksIGVjLCBmcmFtZSkpOwotICAgICAgICBpZiAoZWMpCisgICAg ICAgIGlmIChoYWRFeGNlcHRpb24oZWMsIGVycm9yU3RyaW5nKSkKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgU3RyaW5nIHZhbHVlKHN0b3JhZ2VBcmVhLT5nZXRJdGVtKG5hbWUsIGVjLCBm cmFtZSkpOwotICAgICAgICBpZiAoZWMpCisgICAgICAgIGlmIChoYWRFeGNlcHRpb24oZWMsIGVy cm9yU3RyaW5nKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgUmVmUHRyPFR5cGVCdWls ZGVyOjpBcnJheTxTdHJpbmc+ID4gZW50cnkgPSBUeXBlQnVpbGRlcjo6QXJyYXk8U3RyaW5nPjo6 Y3JlYXRlKCk7CiAgICAgICAgIGVudHJ5LT5hZGRJdGVtKG5hbWUpOwogICAgICAgICBlbnRyeS0+ YWRkSXRlbSh2YWx1ZSk7Ci0gICAgICAgIGVudHJpZXMtPmFkZEl0ZW0oZW50cnkpOworICAgICAg ICBzdG9yYWdlRW50cmllcy0+YWRkSXRlbShlbnRyeSk7CiAgICAgfQorICAgIGVudHJpZXMgPSBz dG9yYWdlRW50cmllcy5yZWxlYXNlKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50OjpzZXRET01TdG9yYWdlSXRlbShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc3RvcmFn ZUlkLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgYm9vbCogc3VjY2Vz cykK