93257 2012-08-06 04:37:11 -0700 Web Inspector: a tiny refactoring of Highlighter in InspectorDOMAgent 2012-08-06 07:14:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 rogulenko webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 688002 0 rogulenko 2012-08-06 04:37:11 -0700 A tiny refactoring of Highlighter in InspectorDOMAgent. 688008 1 156659 rogulenko 2012-08-06 04:42:15 -0700 Created attachment 156659 Patch 688011 2 156662 rogulenko 2012-08-06 04:52:31 -0700 Created attachment 156662 Patch 688029 3 156662 pfeldman 2012-08-06 05:08:35 -0700 Comment on attachment 156662 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156662&action=review > Source/WebCore/inspector/InspectorDOMAgent.cpp:1008 > + m_inspectModeHighlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject); You should return early in case of error. > Source/WebCore/inspector/InspectorDOMAgent.cpp:1054 > + if (highlightConfig) ditto. 688043 4 156668 rogulenko 2012-08-06 05:29:29 -0700 Created attachment 156668 Patch 688044 5 156668 pfeldman 2012-08-06 05:33:21 -0700 Comment on attachment 156668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156668&action=review > Source/WebCore/inspector/InspectorDOMAgent.cpp:1013 > hideHighlight(&error); You wanted to pass errorString there. 688045 6 156669 rogulenko 2012-08-06 05:34:16 -0700 Created attachment 156669 Patch 688106 7 156669 webkit.review.bot 2012-08-06 07:14:40 -0700 Comment on attachment 156669 Patch Clearing flags on attachment: 156669 Committed r124769: <http://trac.webkit.org/changeset/124769> 688107 8 webkit.review.bot 2012-08-06 07:14:45 -0700 All reviewed patches have been landed. Closing bug. 156659 2012-08-06 04:42:15 -0700 2012-08-06 04:52:23 -0700 Patch bug-93257-20120806154150.patch text/plain 4420 rogulenko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNiMjIwZTEyNzIxMjMw ZDc1YmViZDJiZDY5ZGJiMmNlNzJmNTkzMy4uMjlmNzkwYjQwMmU5ZWFkYzI4M2FiYjUzMDM1YTRj NWFlYWE1ZTVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTA4LTA2ICBTZXJn ZXkgUm9ndWxlbmtvICA8cm9ndWxlbmtvQGdvb2dsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogYSB0aW55IHJlZmFjdG9yaW5nIG9mIEhpZ2hsaWdodGVyIGluIEluc3BlY3RvckRPTUFn ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI1 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmlu ZyBlcnJvciBzdHJpbmcgc2V0dGluZyBpbnNpZGUgaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rv ck9iamVjdC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Q29uZmlnRnJv bUluc3BlY3Rvck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6 aGlnaGxpZ2h0Tm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50Lmg6 CisgICAgICAgIChJbnNwZWN0b3JET01BZ2VudCk6CisKKzIwMTItMDgtMDYgIFNlcmdleSBSb2d1 bGVua28gIDxyb2d1bGVua29AZ29vZ2xlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBl eHRyYWN0aW5nIEhpZ2hsaWdodEluZm8gZnJvbSBIaWdobGlnaHREYXRhIGluIERPTU5vZGVIaWdo bGlnaHRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTE2MzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5j cHAKaW5kZXggMjEwMGE5MjcxOTNhNTA0MjE4ZGMzMTg4OTM2YTEyYWY4ZWZmNmU2Ni4uNTU5ODg4 YmQzZGZkMjgwMDZlYTY3YjgzYzUzNGExYjFjODQ1YmRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xMDA0LDIxICsxMDA0LDIxIEBA IHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUoRXJyb3JTdHJpbmcq IGVycm9yU3RyaW5nLCBib29sIGVuYWJsCiAgICAgaWYgKG1fc2VhcmNoaW5nRm9yTm9kZSA9PSBl bmFibGVkKQogICAgICAgICByZXR1cm47CiAgICAgbV9zZWFyY2hpbmdGb3JOb2RlID0gZW5hYmxl ZDsKLSAgICBpZiAoZW5hYmxlZCkgewotICAgICAgICBpZiAoIWhpZ2hsaWdodEluc3BlY3Rvck9i amVjdCkgewotICAgICAgICAgICAgKmVycm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yOiBoaWdo bGlnaHQgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXIgaXMgbWlzc2luZyI7Ci0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgbV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZpZyA9 IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoaGlnaGxpZ2h0SW5zcGVjdG9yT2Jq ZWN0KTsKLSAgICB9CisgICAgaWYgKGVuYWJsZWQpCisgICAgICAgIG1faW5zcGVjdE1vZGVIaWdo bGlnaHRDb25maWcgPSBoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KGVycm9yU3Ry aW5nLCBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpOwogICAgIGVsc2UgewogICAgICAgICBFcnJv clN0cmluZyBlcnJvcjsKICAgICAgICAgaGlkZUhpZ2hsaWdodCgmZXJyb3IpOwogICAgIH0KIH0K IAotUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IEluc3BlY3RvckRPTUFnZW50OjpoaWdobGln aHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEluc3BlY3Rvck9iamVjdCogaGlnaGxpZ2h0SW5z cGVjdG9yT2JqZWN0KQorUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IEluc3BlY3RvckRPTUFn ZW50OjpoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEVycm9yU3RyaW5nKiBlcnJv clN0cmluZywgSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpCiB7Cisg ICAgaWYgKCFoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpIHsKKyAgICAgICAgKmVycm9yU3RyaW5n ID0gIkludGVybmFsIGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXIgaXMg bWlzc2luZyI7CisgICAgICAgIHJldHVybiBQYXNzT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gKCk7 CisgICAgfQorCiAgICAgT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0g YWRvcHRQdHIobmV3IEhpZ2hsaWdodENvbmZpZygpKTsKICAgICBib29sIHNob3dJbmZvID0gZmFs c2U7IC8vIERlZmF1bHQ6IGZhbHNlIChkbyBub3Qgc2hvdyBhIHRvb2x0aXApLgogICAgIGhpZ2hs aWdodEluc3BlY3Rvck9iamVjdC0+Z2V0Qm9vbGVhbigic2hvd0luZm8iLCAmc2hvd0luZm8pOwpA QCAtMTA1MCwxMiArMTA1MCw5IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodE5v ZGUoCiAgICAgY29uc3QgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIGhpZ2hsaWdodEluc3BlY3Rv ck9iamVjdCkKIHsKICAgICBpZiAoTm9kZSogbm9kZSA9IG5vZGVGb3JJZChub2RlSWQpKSB7Ci0g ICAgICAgIGlmICghaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSB7Ci0gICAgICAgICAgICAqZXJy b3JTdHJpbmcgPSAiSW50ZXJuYWwgZXJyb3I6IGhpZ2hsaWdodCBjb25maWd1cmF0aW9uIHBhcmFt ZXRlciBpcyBtaXNzaW5nIjsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAg ICBPd25QdHI8SGlnaGxpZ2h0Q29uZmlnPiBoaWdobGlnaHRDb25maWcgPSBoaWdobGlnaHRDb25m aWdGcm9tSW5zcGVjdG9yT2JqZWN0KGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdC5nZXQoKSk7Ci0g ICAgICAgIG1fb3ZlcmxheS0+aGlnaGxpZ2h0Tm9kZShub2RlLCAqaGlnaGxpZ2h0Q29uZmlnKTsK KyAgICAgICAgT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxp Z2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChlcnJvclN0cmluZywgaGlnaGxpZ2h0SW5zcGVj dG9yT2JqZWN0LmdldCgpKTsKKyAgICAgICAgaWYgKGhpZ2hsaWdodENvbmZpZykKKyAgICAgICAg ICAgIG1fb3ZlcmxheS0+aGlnaGxpZ2h0Tm9kZShub2RlLCAqaGlnaGxpZ2h0Q29uZmlnKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgK aW5kZXggNzMzOWM2M2RjODAyY2QxMWZiNmJkNTYyZGNjNzBmMjEzNzBmNjNhMC4uODQ4MGNjOTI1 NzMzZTUxNjljNjZmNDllNjZlM2Q5NDEwZWJjZTM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKQEAgLTIwMiw3ICsyMDIsNyBAQCBwcml2YXRlOgog ICAgIEluc3BlY3RvckRPTUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JQYWdl QWdlbnQqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciosIEluc3BlY3Rv ck92ZXJsYXkqKTsKIAogICAgIHZvaWQgc2V0U2VhcmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyos IGJvb2wgZW5hYmxlZCwgSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRDb25maWcpOwotICAgIFBh c3NPd25QdHI8SGlnaGxpZ2h0Q29uZmlnPiBoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2Jq ZWN0KEluc3BlY3Rvck9iamVjdCogaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKKyAgICBQYXNz T3duUHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVj dChFcnJvclN0cmluZyosIEluc3BlY3Rvck9iamVjdCogaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0 KTsKIAogICAgIC8vIE5vZGUtcmVsYXRlZCBtZXRob2RzLgogICAgIHR5cGVkZWYgSGFzaE1hcDxS ZWZQdHI8Tm9kZT4sIGludD4gTm9kZVRvSWRNYXA7Cg== 156662 2012-08-06 04:52:31 -0700 2012-08-06 05:29:21 -0700 Patch bug-93257-20120806155207.patch text/plain 4295 rogulenko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTI2NjBhNTRmOWRhMjlh ZTM2ZjI1OWY0ZWM5MGJkZmZkYTg2OWNjOS4uMjQwYTM2OTJiYWQyODUxYmRhZWY3MDI4ZDQ3NjUw YTYzMTk4MDc2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTA2ICBTZXJn ZXkgUm9ndWxlbmtvICA8cm9ndWxlbmtvQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogYSB0aW55IHJlZmFjdG9yaW5nIG9mIEhpZ2hsaWdodGVyIGluIEluc3BlY3RvckRPTUFn ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI1 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmlu ZyBlcnJvciBzdHJpbmcgc2V0dGluZyBpbnNpZGUgaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rv ck9iamVjdC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Q29uZmlnRnJv bUluc3BlY3Rvck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6 aGlnaGxpZ2h0Tm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50Lmg6 CisgICAgICAgIChJbnNwZWN0b3JET01BZ2VudCk6CisKIDIwMTItMDgtMDYgIEtlaXNoaSBIYXR0 b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIG1pbmltdW0gd2luZG93 IHNpemUgZm9yIFBhZ2VQb3B1cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5jcHAKaW5kZXggMjEwMGE5MjcxOTNhNTA0MjE4ZGMzMTg4OTM2YTEyYWY4ZWZm NmU2Ni4uNDE5N2U1MTQ5NGYxZGIwZjYzMDdiY2IzZmIzYzIxMGNhMzU5OGJkNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xMDA0LDIx ICsxMDA0LDIxIEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBib29sIGVuYWJsCiAgICAgaWYgKG1fc2VhcmNoaW5n Rm9yTm9kZSA9PSBlbmFibGVkKQogICAgICAgICByZXR1cm47CiAgICAgbV9zZWFyY2hpbmdGb3JO b2RlID0gZW5hYmxlZDsKLSAgICBpZiAoZW5hYmxlZCkgewotICAgICAgICBpZiAoIWhpZ2hsaWdo dEluc3BlY3Rvck9iamVjdCkgewotICAgICAgICAgICAgKmVycm9yU3RyaW5nID0gIkludGVybmFs IGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXIgaXMgbWlzc2luZyI7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgbV9pbnNwZWN0TW9kZUhpZ2hs aWdodENvbmZpZyA9IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoaGlnaGxpZ2h0 SW5zcGVjdG9yT2JqZWN0KTsKLSAgICB9CisgICAgaWYgKGVuYWJsZWQpCisgICAgICAgIG1faW5z cGVjdE1vZGVIaWdobGlnaHRDb25maWcgPSBoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2Jq ZWN0KGVycm9yU3RyaW5nLCBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpOwogICAgIGVsc2Ugewog ICAgICAgICBFcnJvclN0cmluZyBlcnJvcjsKICAgICAgICAgaGlkZUhpZ2hsaWdodCgmZXJyb3Ip OwogICAgIH0KIH0KIAotUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IEluc3BlY3RvckRPTUFn ZW50OjpoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEluc3BlY3Rvck9iamVjdCog aGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KQorUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IElu c3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEVycm9y U3RyaW5nKiBlcnJvclN0cmluZywgSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRJbnNwZWN0b3JP YmplY3QpCiB7CisgICAgaWYgKCFoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpIHsKKyAgICAgICAg KmVycm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlvbiBw YXJhbWV0ZXIgaXMgbWlzc2luZyI7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KKwog ICAgIE93blB0cjxIaWdobGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZyA9IGFkb3B0UHRyKG5l dyBIaWdobGlnaHRDb25maWcoKSk7CiAgICAgYm9vbCBzaG93SW5mbyA9IGZhbHNlOyAvLyBEZWZh dWx0OiBmYWxzZSAoZG8gbm90IHNob3cgYSB0b29sdGlwKS4KICAgICBoaWdobGlnaHRJbnNwZWN0 b3JPYmplY3QtPmdldEJvb2xlYW4oInNob3dJbmZvIiwgJnNob3dJbmZvKTsKQEAgLTEwNTAsMTIg KzEwNTAsOSBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHROb2RlKAogICAgIGNv bnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpCiB7 CiAgICAgaWYgKE5vZGUqIG5vZGUgPSBub2RlRm9ySWQobm9kZUlkKSkgewotICAgICAgICBpZiAo IWhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCkgewotICAgICAgICAgICAgKmVycm9yU3RyaW5nID0g IkludGVybmFsIGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXIgaXMgbWlz c2luZyI7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgT3duUHRyPEhp Z2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3Bl Y3Rvck9iamVjdChoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QuZ2V0KCkpOwotICAgICAgICBtX292 ZXJsYXktPmhpZ2hsaWdodE5vZGUobm9kZSwgKmhpZ2hsaWdodENvbmZpZyk7CisgICAgICAgIE93 blB0cjxIaWdobGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZyA9IGhpZ2hsaWdodENvbmZpZ0Zy b21JbnNwZWN0b3JPYmplY3QoZXJyb3JTdHJpbmcsIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdC5n ZXQoKSk7CisgICAgICAgIGlmIChoaWdobGlnaHRDb25maWcpCisgICAgICAgICAgICBtX292ZXJs YXktPmhpZ2hsaWdodE5vZGUobm9kZSwgKmhpZ2hsaWdodENvbmZpZyk7CiAgICAgfQogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IDczMzlj NjNkYzgwMmNkMTFmYjZiZDU2MmRjYzcwZjIxMzcwZjYzYTAuLjg0ODBjYzkyNTczM2U1MTY5YzY2 ZjQ5ZTY2ZTNkOTQxMGViY2UzNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JET01BZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5oCkBAIC0yMDIsNyArMjAyLDcgQEAgcHJpdmF0ZToKICAgICBJbnNwZWN0 b3JET01BZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiwgSW5zcGVjdG9yUGFnZUFnZW50KiwgSW5z cGVjdG9yU3RhdGUqLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqLCBJbnNwZWN0b3JPdmVybGF5Kik7 CiAKICAgICB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoRXJyb3JTdHJpbmcqLCBib29sIGVuYWJs ZWQsIEluc3BlY3Rvck9iamVjdCogaGlnaGxpZ2h0Q29uZmlnKTsKLSAgICBQYXNzT3duUHRyPEhp Z2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChJbnNwZWN0 b3JPYmplY3QqIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCk7CisgICAgUGFzc093blB0cjxIaWdo bGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoRXJyb3JTdHJp bmcqLCBJbnNwZWN0b3JPYmplY3QqIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCk7CiAKICAgICAv LyBOb2RlLXJlbGF0ZWQgbWV0aG9kcy4KICAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPE5vZGU+ LCBpbnQ+IE5vZGVUb0lkTWFwOwo= 156668 2012-08-06 05:29:29 -0700 2012-08-06 05:34:07 -0700 Patch bug-93257-20120806162905.patch text/plain 4430 rogulenko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTI2NjBhNTRmOWRhMjlh ZTM2ZjI1OWY0ZWM5MGJkZmZkYTg2OWNjOS4uMjQwYTM2OTJiYWQyODUxYmRhZWY3MDI4ZDQ3NjUw YTYzMTk4MDc2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTA2ICBTZXJn ZXkgUm9ndWxlbmtvICA8cm9ndWxlbmtvQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogYSB0aW55IHJlZmFjdG9yaW5nIG9mIEhpZ2hsaWdodGVyIGluIEluc3BlY3RvckRPTUFn ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI1 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmlu ZyBlcnJvciBzdHJpbmcgc2V0dGluZyBpbnNpZGUgaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rv ck9iamVjdC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Q29uZmlnRnJv bUluc3BlY3Rvck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6 aGlnaGxpZ2h0Tm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50Lmg6 CisgICAgICAgIChJbnNwZWN0b3JET01BZ2VudCk6CisKIDIwMTItMDgtMDYgIEtlaXNoaSBIYXR0 b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIG1pbmltdW0gd2luZG93 IHNpemUgZm9yIFBhZ2VQb3B1cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5jcHAKaW5kZXggMjEwMGE5MjcxOTNhNTA0MjE4ZGMzMTg4OTM2YTEyYWY4ZWZm NmU2Ni4uYjJlZjRmZmUwMTgxZDA0NzJhYmUyZTUxZDg4Y2FmYWVmNDI5NTQzNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xMDA1LDIw ICsxMDA1LDIyIEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBib29sIGVuYWJsCiAgICAgICAgIHJldHVybjsKICAg ICBtX3NlYXJjaGluZ0Zvck5vZGUgPSBlbmFibGVkOwogICAgIGlmIChlbmFibGVkKSB7Ci0gICAg ICAgIGlmICghaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSB7Ci0gICAgICAgICAgICAqZXJyb3JT dHJpbmcgPSAiSW50ZXJuYWwgZXJyb3I6IGhpZ2hsaWdodCBjb25maWd1cmF0aW9uIHBhcmFtZXRl ciBpcyBtaXNzaW5nIjsKKyAgICAgICAgbV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZpZyA9IGhp Z2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoZXJyb3JTdHJpbmcsIGhpZ2hsaWdodElu c3BlY3Rvck9iamVjdCk7CisgICAgICAgIGlmICghbV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZp ZykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBtX2luc3BlY3RNb2Rl SGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChoaWdo bGlnaHRJbnNwZWN0b3JPYmplY3QpOwotICAgIH0KLSAgICBlbHNlIHsKKyAgICB9IGVsc2Ugewog ICAgICAgICBFcnJvclN0cmluZyBlcnJvcjsKICAgICAgICAgaGlkZUhpZ2hsaWdodCgmZXJyb3Ip OwogICAgIH0KIH0KIAotUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IEluc3BlY3RvckRPTUFn ZW50OjpoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEluc3BlY3Rvck9iamVjdCog aGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KQorUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IElu c3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEVycm9y U3RyaW5nKiBlcnJvclN0cmluZywgSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRJbnNwZWN0b3JP YmplY3QpCiB7CisgICAgaWYgKCFoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpIHsKKyAgICAgICAg KmVycm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlvbiBw YXJhbWV0ZXIgaXMgbWlzc2luZyI7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KKwog ICAgIE93blB0cjxIaWdobGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZyA9IGFkb3B0UHRyKG5l dyBIaWdobGlnaHRDb25maWcoKSk7CiAgICAgYm9vbCBzaG93SW5mbyA9IGZhbHNlOyAvLyBEZWZh dWx0OiBmYWxzZSAoZG8gbm90IHNob3cgYSB0b29sdGlwKS4KICAgICBoaWdobGlnaHRJbnNwZWN0 b3JPYmplY3QtPmdldEJvb2xlYW4oInNob3dJbmZvIiwgJnNob3dJbmZvKTsKQEAgLTEwNDksMTQg KzEwNTEsMTUgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Tm9kZSgKICAgICBp bnQgbm9kZUlkLAogICAgIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiBoaWdobGlnaHRJ bnNwZWN0b3JPYmplY3QpCiB7Ci0gICAgaWYgKE5vZGUqIG5vZGUgPSBub2RlRm9ySWQobm9kZUlk KSkgewotICAgICAgICBpZiAoIWhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCkgewotICAgICAgICAg ICAgKmVycm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlv biBwYXJhbWV0ZXIgaXMgbWlzc2luZyI7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K LSAgICAgICAgT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxp Z2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QuZ2V0 KCkpOwotICAgICAgICBtX292ZXJsYXktPmhpZ2hsaWdodE5vZGUobm9kZSwgKmhpZ2hsaWdodENv bmZpZyk7Ci0gICAgfQorICAgIE5vZGUqIG5vZGUgPSBub2RlRm9ySWQobm9kZUlkKTsKKyAgICBp ZiAoIW5vZGUpCisgICAgICAgIHJldHVybjsKKworICAgIE93blB0cjxIaWdobGlnaHRDb25maWc+ IGhpZ2hsaWdodENvbmZpZyA9IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoZXJy b3JTdHJpbmcsIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdC5nZXQoKSk7CisgICAgaWYgKCFoaWdo bGlnaHRDb25maWcpCisgICAgICAgIHJldHVybjsKKworICAgIG1fb3ZlcmxheS0+aGlnaGxpZ2h0 Tm9kZShub2RlLCAqaGlnaGxpZ2h0Q29uZmlnKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JET01BZ2Vu dDo6aGlnaGxpZ2h0RnJhbWUoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5oCmluZGV4IDczMzljNjNkYzgwMmNkMTFmYjZiZDU2MmRjYzcwZjIxMzcwZjYzYTAu Ljg0ODBjYzkyNTczM2U1MTY5YzY2ZjQ5ZTY2ZTNkOTQxMGViY2UzNTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCkBAIC0yMDIsNyArMjAyLDcgQEAg cHJpdmF0ZToKICAgICBJbnNwZWN0b3JET01BZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiwgSW5z cGVjdG9yUGFnZUFnZW50KiwgSW5zcGVjdG9yU3RhdGUqLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIq LCBJbnNwZWN0b3JPdmVybGF5Kik7CiAKICAgICB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoRXJy b3JTdHJpbmcqLCBib29sIGVuYWJsZWQsIEluc3BlY3Rvck9iamVjdCogaGlnaGxpZ2h0Q29uZmln KTsKLSAgICBQYXNzT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnRnJvbUlu c3BlY3Rvck9iamVjdChJbnNwZWN0b3JPYmplY3QqIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCk7 CisgICAgUGFzc093blB0cjxIaWdobGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNw ZWN0b3JPYmplY3QoRXJyb3JTdHJpbmcqLCBJbnNwZWN0b3JPYmplY3QqIGhpZ2hsaWdodEluc3Bl Y3Rvck9iamVjdCk7CiAKICAgICAvLyBOb2RlLXJlbGF0ZWQgbWV0aG9kcy4KICAgICB0eXBlZGVm IEhhc2hNYXA8UmVmUHRyPE5vZGU+LCBpbnQ+IE5vZGVUb0lkTWFwOwo= 156669 2012-08-06 05:34:16 -0700 2012-08-06 07:14:40 -0700 Patch bug-93257-20120806163352.patch text/plain 4465 rogulenko U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTI2NjBhNTRmOWRhMjlh ZTM2ZjI1OWY0ZWM5MGJkZmZkYTg2OWNjOS4uMjQwYTM2OTJiYWQyODUxYmRhZWY3MDI4ZDQ3NjUw YTYzMTk4MDc2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTA2ICBTZXJn ZXkgUm9ndWxlbmtvICA8cm9ndWxlbmtvQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogYSB0aW55IHJlZmFjdG9yaW5nIG9mIEhpZ2hsaWdodGVyIGluIEluc3BlY3RvckRPTUFn ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI1 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmlu ZyBlcnJvciBzdHJpbmcgc2V0dGluZyBpbnNpZGUgaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rv ck9iamVjdC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Q29uZmlnRnJv bUluc3BlY3Rvck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6 aGlnaGxpZ2h0Tm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50Lmg6 CisgICAgICAgIChJbnNwZWN0b3JET01BZ2VudCk6CisKIDIwMTItMDgtMDYgIEtlaXNoaSBIYXR0 b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIG1pbmltdW0gd2luZG93 IHNpemUgZm9yIFBhZ2VQb3B1cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5jcHAKaW5kZXggMjEwMGE5MjcxOTNhNTA0MjE4ZGMzMTg4OTM2YTEyYWY4ZWZm NmU2Ni4uMmExMTY1OWZhZjBlMGIxYzZlOTI1OTU2YTU2ZTcyNjliNjJjNGI3OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xMDA1LDIw ICsxMDA1LDIwIEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBib29sIGVuYWJsCiAgICAgICAgIHJldHVybjsKICAg ICBtX3NlYXJjaGluZ0Zvck5vZGUgPSBlbmFibGVkOwogICAgIGlmIChlbmFibGVkKSB7Ci0gICAg ICAgIGlmICghaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSB7Ci0gICAgICAgICAgICAqZXJyb3JT dHJpbmcgPSAiSW50ZXJuYWwgZXJyb3I6IGhpZ2hsaWdodCBjb25maWd1cmF0aW9uIHBhcmFtZXRl ciBpcyBtaXNzaW5nIjsKKyAgICAgICAgbV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZpZyA9IGhp Z2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoZXJyb3JTdHJpbmcsIGhpZ2hsaWdodElu c3BlY3Rvck9iamVjdCk7CisgICAgICAgIGlmICghbV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZp ZykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBtX2luc3BlY3RNb2Rl SGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChoaWdo bGlnaHRJbnNwZWN0b3JPYmplY3QpOwotICAgIH0KLSAgICBlbHNlIHsKLSAgICAgICAgRXJyb3JT dHJpbmcgZXJyb3I7Ci0gICAgICAgIGhpZGVIaWdobGlnaHQoJmVycm9yKTsKLSAgICB9CisgICAg fSBlbHNlCisgICAgICAgIGhpZGVIaWdobGlnaHQoZXJyb3JTdHJpbmcpOwogfQogCi1QYXNzT3du UHRyPEhpZ2hsaWdodENvbmZpZz4gSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodENvbmZpZ0Zy b21JbnNwZWN0b3JPYmplY3QoSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRJbnNwZWN0b3JPYmpl Y3QpCitQYXNzT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hs aWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBJ bnNwZWN0b3JPYmplY3QqIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCkKIHsKKyAgICBpZiAoIWhp Z2hsaWdodEluc3BlY3Rvck9iamVjdCkgeworICAgICAgICAqZXJyb3JTdHJpbmcgPSAiSW50ZXJu YWwgZXJyb3I6IGhpZ2hsaWdodCBjb25maWd1cmF0aW9uIHBhcmFtZXRlciBpcyBtaXNzaW5nIjsK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCiAgICAgT3duUHRyPEhpZ2hsaWdodENv bmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0gYWRvcHRQdHIobmV3IEhpZ2hsaWdodENvbmZpZygpKTsK ICAgICBib29sIHNob3dJbmZvID0gZmFsc2U7IC8vIERlZmF1bHQ6IGZhbHNlIChkbyBub3Qgc2hv dyBhIHRvb2x0aXApLgogICAgIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdC0+Z2V0Qm9vbGVhbigi c2hvd0luZm8iLCAmc2hvd0luZm8pOwpAQCAtMTA0OSwxNCArMTA0OSwxNSBAQCB2b2lkIEluc3Bl Y3RvckRPTUFnZW50OjpoaWdobGlnaHROb2RlKAogICAgIGludCBub2RlSWQsCiAgICAgY29uc3Qg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCkKIHsKLSAg ICBpZiAoTm9kZSogbm9kZSA9IG5vZGVGb3JJZChub2RlSWQpKSB7Ci0gICAgICAgIGlmICghaGln aGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSB7Ci0gICAgICAgICAgICAqZXJyb3JTdHJpbmcgPSAiSW50 ZXJuYWwgZXJyb3I6IGhpZ2hsaWdodCBjb25maWd1cmF0aW9uIHBhcmFtZXRlciBpcyBtaXNzaW5n IjsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBPd25QdHI8SGlnaGxp Z2h0Q29uZmlnPiBoaWdobGlnaHRDb25maWcgPSBoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9y T2JqZWN0KGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdC5nZXQoKSk7Ci0gICAgICAgIG1fb3Zlcmxh eS0+aGlnaGxpZ2h0Tm9kZShub2RlLCAqaGlnaGxpZ2h0Q29uZmlnKTsKLSAgICB9CisgICAgTm9k ZSogbm9kZSA9IG5vZGVGb3JJZChub2RlSWQpOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgT3duUHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0gaGln aGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChlcnJvclN0cmluZywgaGlnaGxpZ2h0SW5z cGVjdG9yT2JqZWN0LmdldCgpKTsKKyAgICBpZiAoIWhpZ2hsaWdodENvbmZpZykKKyAgICAgICAg cmV0dXJuOworCisgICAgbV9vdmVybGF5LT5oaWdobGlnaHROb2RlKG5vZGUsICpoaWdobGlnaHRD b25maWcpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRGcmFtZSgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKaW5kZXggNzMzOWM2 M2RjODAyY2QxMWZiNmJkNTYyZGNjNzBmMjEzNzBmNjNhMC4uODQ4MGNjOTI1NzMzZTUxNjljNjZm NDllNjZlM2Q5NDEwZWJjZTM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmgKQEAgLTIwMiw3ICsyMDIsNyBAQCBwcml2YXRlOgogICAgIEluc3BlY3Rv ckRPTUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JQYWdlQWdlbnQqLCBJbnNw ZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciosIEluc3BlY3Rvck92ZXJsYXkqKTsK IAogICAgIHZvaWQgc2V0U2VhcmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyosIGJvb2wgZW5hYmxl ZCwgSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRDb25maWcpOwotICAgIFBhc3NPd25QdHI8SGln aGxpZ2h0Q29uZmlnPiBoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KEluc3BlY3Rv ck9iamVjdCogaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKKyAgICBQYXNzT3duUHRyPEhpZ2hs aWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChFcnJvclN0cmlu ZyosIEluc3BlY3Rvck9iamVjdCogaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKIAogICAgIC8v IE5vZGUtcmVsYXRlZCBtZXRob2RzLgogICAgIHR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8Tm9kZT4s IGludD4gTm9kZVRvSWRNYXA7Cg==