83797 2012-04-12 11:13:31 -0700 [EFL] [DRT] Feeding key events with invalid keyName 2012-04-16 07:17:53 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 naginenis naginenis gyuyoung.kim lucas.de.marchi pnormand rakuco tonikitoo webkit.review.bot oldest_to_newest 601376 0 naginenis 2012-04-12 11:13:31 -0700 keyName passed to KeyEventInfo is not valid after this function returns, so use CString to keep the keyName valid within the scope of KeyEventInfo. static KeyEventInfo* createKeyEventInfo(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) { .... const CString cCharacter = character.get()->ustring().utf8(); .... if (!keyName) keyName = cCharacter.data(); return new KeyEventInfo(keyName, modifiers); } 601392 1 136942 naginenis 2012-04-12 11:40:06 -0700 Created attachment 136942 Patch Using CString to keep the keyName valid within scope of KeyEventInfo 602178 2 136942 rakuco 2012-04-13 10:27:26 -0700 Comment on attachment 136942 Patch Makes sense, thanks. 603045 3 136942 pnormand 2012-04-16 04:42:17 -0700 Comment on attachment 136942 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136942&action=review > Tools/DumpRenderTree/efl/EventSender.cpp:437 > const CString cCharacter = character.get()->ustring().utf8(); > const char* keyName = (location == DomKeyLocationNumpad) ? keyPadNameFromJSValue(character.get()) : keyNameFromJSValue(character.get()); > - if (!keyName) > - keyName = cCharacter.data(); > > - return new KeyEventInfo(keyName, modifiers); > + return new KeyEventInfo(keyName ? CString(keyName) : cCharacter, modifiers); Seems like keyPadNameFromJSValue() should return a CString now. That would simplify this code block, I think. 603106 4 naginenis 2012-04-16 06:36:54 -0700 (In reply to comment #3) > (From update of attachment 136942 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=136942&action=review > > > Tools/DumpRenderTree/efl/EventSender.cpp:437 > > const CString cCharacter = character.get()->ustring().utf8(); > > const char* keyName = (location == DomKeyLocationNumpad) ? keyPadNameFromJSValue(character.get()) : keyNameFromJSValue(character.get()); > > - if (!keyName) > > - keyName = cCharacter.data(); > > > > - return new KeyEventInfo(keyName, modifiers); > > + return new KeyEventInfo(keyName ? CString(keyName) : cCharacter, modifiers); > > Seems like keyPadNameFromJSValue() should return a CString now. That would simplify this code block, I think. Thanks for your review Philippe. Yes, it simplifies the code. I will update the patch. 603110 5 137335 naginenis 2012-04-16 06:46:10 -0700 Created attachment 137335 Patch fixed review comment #3. 603133 6 137335 webkit.review.bot 2012-04-16 07:17:48 -0700 Comment on attachment 137335 Patch Clearing flags on attachment: 137335 Committed r114250: <http://trac.webkit.org/changeset/114250> 603134 7 webkit.review.bot 2012-04-16 07:17:53 -0700 All reviewed patches have been landed. Closing bug. 136942 2012-04-12 11:40:06 -0700 2012-04-16 06:46:10 -0700 Patch keyevent.diff text/plain 3460 naginenis ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYjFjMDY4Li4wZWZlZDFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MTIgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBsaW51eC5pbnRlbC5j b20+CisKKyAgICAgICAgW0VGTF0gW0RSVF0gRmVlZGluZyBrZXkgZXZlbnRzIHdpdGggaW52YWxp ZCBrZXlOYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04Mzc5NworCisgICAgICAgIFVuc2tpcCBmYXN0L2ZyYW1lcy9pZnJhbWUtd2luZG93LWZvY3Vz Lmh0bWwKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA0LTEyICBaYWxhbiBCdWp0YXMgIDx6YnVq dGFzQGdtYWlsLmNvbT4KIAogICAgICAgICBbUXRdW1dLMl0gWm9vbSBnZXN0dXJlIHdpdGggZG91 YmxlIHRhcCBjcmFzaGVzIG9uIGlmcmFtZSB3aGVuIG1haW4gZnJhbWUgaGFzIHNjcm9sbCBvZmZz ZXQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZCBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVkCmluZGV4IDQ0Y2M0ZmMuLjdlMjA2ZDU1IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtMTI5Niw3ICsxMjk2LDYgQEAgZmFzdC9mb3Jtcy9l bnRlci1jbGlja3MtYnV0dG9ucy5odG1sCiBmYXN0L2Zvcm1zL2lucHV0LXNlYXJjaC1wcmVzcy1l c2NhcGUta2V5Lmh0bWwKIGZhc3QvZm9ybXMvaW5wdXQtdGV4dC1lbnRlci5odG1sCiBmYXN0L2Zv cm1zL3RleHRpbnB1dC1ub3QtZmlyZWQtb24tZW50ZXItaW4taW5wdXQuaHRtbAotZmFzdC9mcmFt ZXMvaWZyYW1lLXdpbmRvdy1mb2N1cy5odG1sCiBodHRwL3Rlc3RzL21pc2MvaXNpbmRleC13aXRo LW5vLWZvcm0uaHRtbAogCiAjIEJVRzogbW91c2UtcmVsYXRlZCBidWdzIGluIHRoZSBFdmVudFNl bmRlci1QbGF0Zm9ybU1vdXNlRXZlbnRFZmwgaW50ZXJhY3Rpb24KZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0NjVhNDk0Li44ZDJkNTVjIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTkgQEAKKzIwMTItMDQtMTIgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVu aUBsaW51eC5pbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gW0RSVF0gRmVlZGluZyBrZXkgZXZl bnRzIHdpdGggaW52YWxpZCBrZXlOYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04Mzc5NworCisgICAgICAgIEtlZXAgdGhlIGtleU5hbWUgdmFsaWQg d2l0aGluIHNjb3BlIG9mIEtleUV2ZW50SW5mbyB0byBhdm9pZAorICAgICAgICBmZWVkaW5nIGtl eSBldmVudHMgd2l0aCBpbnZhbGlkIGtleU5hbWUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIu Y3BwOgorICAgICAgICAoS2V5RXZlbnRJbmZvOjpLZXlFdmVudEluZm8pOgorICAgICAgICAoS2V5 RXZlbnRJbmZvKToKKyAgICAgICAgKGNyZWF0ZUtleUV2ZW50SW5mbyk6CisgICAgICAgIChzZW5k S2V5RG93bik6CisKIDIwMTItMDQtMTEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgRml4IHJlZ3Jlc3Npb24gaW50cm9kdWNlZCBpbiByMTEzOTI3LgpkaWZm IC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcCBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNlbmRlci5jcHAKaW5kZXggNTkzNGQ0Yy4uOTFjMDFm MSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIuY3BwCkBAIC0xMDQsMTMg KzEwNCwxMyBAQCBlbnVtIFpvb21FdmVudCB7CiB9OwogCiBzdHJ1Y3QgS2V5RXZlbnRJbmZvIHsK LSAgICBLZXlFdmVudEluZm8oY29uc3QgY2hhcioga2V5TmFtZSwgRXZhc0tleU1vZGlmaWVyIG1v ZGlmaWVycykKKyAgICBLZXlFdmVudEluZm8oY29uc3QgQ1N0cmluZyYga2V5TmFtZSwgRXZhc0tl eU1vZGlmaWVyIG1vZGlmaWVycykKICAgICAgICAgOiBrZXlOYW1lKGtleU5hbWUpCiAgICAgICAg ICwgbW9kaWZpZXJzKG1vZGlmaWVycykKICAgICB7CiAgICAgfQogCi0gICAgY29uc3QgY2hhciog a2V5TmFtZTsKKyAgICBjb25zdCBDU3RyaW5nIGtleU5hbWU7CiAgICAgRXZhc0tleU1vZGlmaWVy IG1vZGlmaWVyczsKIH07CiAKQEAgLTQzMywxMCArNDMzLDggQEAgc3RhdGljIEtleUV2ZW50SW5m byogY3JlYXRlS2V5RXZlbnRJbmZvKEpTQ29udGV4dFJlZiBjb250ZXh0LCBzaXplX3QgYXJndW1l bnRDb3UKIAogICAgIGNvbnN0IENTdHJpbmcgY0NoYXJhY3RlciA9IGNoYXJhY3Rlci5nZXQoKS0+ dXN0cmluZygpLnV0ZjgoKTsKICAgICBjb25zdCBjaGFyKiBrZXlOYW1lID0gKGxvY2F0aW9uID09 IERvbUtleUxvY2F0aW9uTnVtcGFkKSA/IGtleVBhZE5hbWVGcm9tSlNWYWx1ZShjaGFyYWN0ZXIu Z2V0KCkpIDoga2V5TmFtZUZyb21KU1ZhbHVlKGNoYXJhY3Rlci5nZXQoKSk7Ci0gICAgaWYgKCFr ZXlOYW1lKQotICAgICAgICBrZXlOYW1lID0gY0NoYXJhY3Rlci5kYXRhKCk7CiAKLSAgICByZXR1 cm4gbmV3IEtleUV2ZW50SW5mbyhrZXlOYW1lLCBtb2RpZmllcnMpOworICAgIHJldHVybiBuZXcg S2V5RXZlbnRJbmZvKGtleU5hbWUgPyBDU3RyaW5nKGtleU5hbWUpIDogY0NoYXJhY3RlciwgbW9k aWZpZXJzKTsKIH0KIAogc3RhdGljIHZvaWQgc2VuZEtleURvd24oRXZhcyogZXZhcywgS2V5RXZl bnRJbmZvKiBrZXlFdmVudEluZm8pCkBAIC00NDQsNyArNDQyLDcgQEAgc3RhdGljIHZvaWQgc2Vu ZEtleURvd24oRXZhcyogZXZhcywgS2V5RXZlbnRJbmZvKiBrZXlFdmVudEluZm8pCiAgICAgaWYg KCFrZXlFdmVudEluZm8pCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnN0IGNoYXIqIGtleU5h bWUgPSBrZXlFdmVudEluZm8tPmtleU5hbWU7CisgICAgY29uc3QgY2hhcioga2V5TmFtZSA9IGtl eUV2ZW50SW5mby0+a2V5TmFtZS5kYXRhKCk7CiAgICAgRXZhc0tleU1vZGlmaWVyIG1vZGlmaWVy cyA9IGtleUV2ZW50SW5mby0+bW9kaWZpZXJzOwogCiAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0 RWZsOjpsYXlvdXRGcmFtZShicm93c2VyLT5tYWluRnJhbWUoKSk7Cg== 137335 2012-04-16 06:46:10 -0700 2012-04-16 07:17:48 -0700 Patch keyevent.diff text/plain 4651 naginenis ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1ZDhkM2VmLi40ZmFkYjA4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MTYgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBsaW51eC5pbnRlbC5j b20+CisKKyAgICAgICAgW0VGTF0gW0RSVF0gRmVlZGluZyBrZXkgZXZlbnRzIHdpdGggaW52YWxp ZCBrZXlOYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04Mzc5NworCisgICAgICAgIFVuc2tpcCBmYXN0L2ZyYW1lcy9pZnJhbWUtd2luZG93LWZvY3Vz Lmh0bWwKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA0LTE2ICBQaGlsaXBwZSBOb3JtYW5kICA8 cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBHVEsgZ2FyZGVuaW5n LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRleCBiOTBkNzZjLi4wODcxNGExIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtMTI5NSw3ICsxMjk1LDYgQEAgZmFzdC9mb3Jtcy9lbnRl ci1jbGlja3MtYnV0dG9ucy5odG1sCiBmYXN0L2Zvcm1zL2lucHV0LXNlYXJjaC1wcmVzcy1lc2Nh cGUta2V5Lmh0bWwKIGZhc3QvZm9ybXMvaW5wdXQtdGV4dC1lbnRlci5odG1sCiBmYXN0L2Zvcm1z L3RleHRpbnB1dC1ub3QtZmlyZWQtb24tZW50ZXItaW4taW5wdXQuaHRtbAotZmFzdC9mcmFtZXMv aWZyYW1lLXdpbmRvdy1mb2N1cy5odG1sCiBodHRwL3Rlc3RzL21pc2MvaXNpbmRleC13aXRoLW5v LWZvcm0uaHRtbAogCiAjIEJVRzogbW91c2UtcmVsYXRlZCBidWdzIGluIHRoZSBFdmVudFNlbmRl ci1QbGF0Zm9ybU1vdXNlRXZlbnRFZmwgaW50ZXJhY3Rpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMTI2YzU1Li4wYzQ2MjAzIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMDQtMTYgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBs aW51eC5pbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gW0RSVF0gRmVlZGluZyBrZXkgZXZlbnRz IHdpdGggaW52YWxpZCBrZXlOYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04Mzc5NworCisgICAgICAgIEtlZXAgdGhlIGtleU5hbWUgdmFsaWQgd2l0 aGluIHNjb3BlIG9mIEtleUV2ZW50SW5mbyB0byBhdm9pZAorICAgICAgICBmZWVkaW5nIGtleSBl dmVudHMgd2l0aCBpbnZhbGlkIGtleU5hbWUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIuY3Bw OgorICAgICAgICAoS2V5RXZlbnRJbmZvOjpLZXlFdmVudEluZm8pOgorICAgICAgICAoS2V5RXZl bnRJbmZvKToKKyAgICAgICAgKGtleVBhZE5hbWVGcm9tSlNWYWx1ZSk6CisgICAgICAgIChrZXlO YW1lRnJvbUpTVmFsdWUpOgorICAgICAgICAoY3JlYXRlS2V5RXZlbnRJbmZvKToKKyAgICAgICAg KHNlbmRLZXlEb3duKToKKwogMjAxMi0wNC0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5k QGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIGdhcmRlbmluZy4KZGlmZiAt LWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNlbmRlci5jcHAgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIuY3BwCmluZGV4IDU5MzRkNGMuLjg3YjEzMjAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNlbmRlci5jcHAKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcApAQCAtMTA0LDEzICsx MDQsMTMgQEAgZW51bSBab29tRXZlbnQgewogfTsKIAogc3RydWN0IEtleUV2ZW50SW5mbyB7Ci0g ICAgS2V5RXZlbnRJbmZvKGNvbnN0IGNoYXIqIGtleU5hbWUsIEV2YXNLZXlNb2RpZmllciBtb2Rp ZmllcnMpCisgICAgS2V5RXZlbnRJbmZvKGNvbnN0IENTdHJpbmcmIGtleU5hbWUsIEV2YXNLZXlN b2RpZmllciBtb2RpZmllcnMpCiAgICAgICAgIDoga2V5TmFtZShrZXlOYW1lKQogICAgICAgICAs IG1vZGlmaWVycyhtb2RpZmllcnMpCiAgICAgewogICAgIH0KIAotICAgIGNvbnN0IGNoYXIqIGtl eU5hbWU7CisgICAgY29uc3QgQ1N0cmluZyBrZXlOYW1lOwogICAgIEV2YXNLZXlNb2RpZmllciBt b2RpZmllcnM7CiB9OwogCkBAIC0zMjIsNyArMzIyLDcgQEAgc3RhdGljIEpTVmFsdWVSZWYgY29u dGludW91c01vdXNlU2Nyb2xsQnlDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmpl Y3QKICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CiB9CiAKLXN0YXRp YyBjb25zdCBjaGFyKiBrZXlQYWROYW1lRnJvbUpTVmFsdWUoSlNTdHJpbmdSZWYgY2hhcmFjdGVy KQorc3RhdGljIGNvbnN0IENTdHJpbmcga2V5UGFkTmFtZUZyb21KU1ZhbHVlKEpTU3RyaW5nUmVm IGNoYXJhY3RlcikKIHsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImxlZnRBcnJvdyIpKQog ICAgICAgICByZXR1cm4gIktQX0xlZnQiOwpAQCAtMzQ1LDEwICszNDUsMTAgQEAgc3RhdGljIGNv bnN0IGNoYXIqIGtleVBhZE5hbWVGcm9tSlNWYWx1ZShKU1N0cmluZ1JlZiBjaGFyYWN0ZXIpCiAg ICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJkZWxldGUiKSkKICAgICAgICAgcmV0dXJuICJLUF9E ZWxldGUiOwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIGNoYXJhY3Rlci0+dXN0cmluZygp LnV0ZjgoKTsKIH0KIAotc3RhdGljIGNvbnN0IGNoYXIqIGtleU5hbWVGcm9tSlNWYWx1ZShKU1N0 cmluZ1JlZiBjaGFyYWN0ZXIpCitzdGF0aWMgY29uc3QgQ1N0cmluZyBrZXlOYW1lRnJvbUpTVmFs dWUoSlNTdHJpbmdSZWYgY2hhcmFjdGVyKQogewogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAi bGVmdEFycm93IikpCiAgICAgICAgIHJldHVybiAiTGVmdCI7CkBAIC00MDcsNyArNDA3LDcgQEAg c3RhdGljIGNvbnN0IGNoYXIqIGtleU5hbWVGcm9tSlNWYWx1ZShKU1N0cmluZ1JlZiBjaGFyYWN0 ZXIpCiAgICAgaWYgKGNoYXJDb2RlID09ICdceDgnKQogICAgICAgICByZXR1cm4gIkJhY2tTcGFj ZSI7CiAKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gY2hhcmFjdGVyLT51c3RyaW5nKCkudXRm OCgpOwogfQogCiBzdGF0aWMgS2V5RXZlbnRJbmZvKiBjcmVhdGVLZXlFdmVudEluZm8oSlNDb250 ZXh0UmVmIGNvbnRleHQsIHNpemVfdCBhcmd1bWVudENvdW50LCBjb25zdCBKU1ZhbHVlUmVmIGFy Z3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCkBAIC00MzEsMTEgKzQzMSw3IEBAIHN0 YXRpYyBLZXlFdmVudEluZm8qIGNyZWF0ZUtleUV2ZW50SW5mbyhKU0NvbnRleHRSZWYgY29udGV4 dCwgc2l6ZV90IGFyZ3VtZW50Q291CiAgICAgaWYgKGFyZ3VtZW50Q291bnQgPj0gMikKICAgICAg ICAgbW9kaWZpZXJzID0gbW9kaWZpZXJzRnJvbUpTVmFsdWUoY29udGV4dCwgYXJndW1lbnRzWzFd KTsKIAotICAgIGNvbnN0IENTdHJpbmcgY0NoYXJhY3RlciA9IGNoYXJhY3Rlci5nZXQoKS0+dXN0 cmluZygpLnV0ZjgoKTsKLSAgICBjb25zdCBjaGFyKiBrZXlOYW1lID0gKGxvY2F0aW9uID09IERv bUtleUxvY2F0aW9uTnVtcGFkKSA/IGtleVBhZE5hbWVGcm9tSlNWYWx1ZShjaGFyYWN0ZXIuZ2V0 KCkpIDoga2V5TmFtZUZyb21KU1ZhbHVlKGNoYXJhY3Rlci5nZXQoKSk7Ci0gICAgaWYgKCFrZXlO YW1lKQotICAgICAgICBrZXlOYW1lID0gY0NoYXJhY3Rlci5kYXRhKCk7Ci0KKyAgICBjb25zdCBD U3RyaW5nIGtleU5hbWUgPSAobG9jYXRpb24gPT0gRG9tS2V5TG9jYXRpb25OdW1wYWQpID8ga2V5 UGFkTmFtZUZyb21KU1ZhbHVlKGNoYXJhY3Rlci5nZXQoKSkgOiBrZXlOYW1lRnJvbUpTVmFsdWUo Y2hhcmFjdGVyLmdldCgpKTsKICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbyhrZXlOYW1lLCBt b2RpZmllcnMpOwogfQogCkBAIC00NDQsNyArNDQwLDcgQEAgc3RhdGljIHZvaWQgc2VuZEtleURv d24oRXZhcyogZXZhcywgS2V5RXZlbnRJbmZvKiBrZXlFdmVudEluZm8pCiAgICAgaWYgKCFrZXlF dmVudEluZm8pCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnN0IGNoYXIqIGtleU5hbWUgPSBr ZXlFdmVudEluZm8tPmtleU5hbWU7CisgICAgY29uc3QgY2hhcioga2V5TmFtZSA9IGtleUV2ZW50 SW5mby0+a2V5TmFtZS5kYXRhKCk7CiAgICAgRXZhc0tleU1vZGlmaWVyIG1vZGlmaWVycyA9IGtl eUV2ZW50SW5mby0+bW9kaWZpZXJzOwogCiAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjps YXlvdXRGcmFtZShicm93c2VyLT5tYWluRnJhbWUoKSk7Cg==