123829 2013-11-05 14:26:37 -0800 Add support for decoding NSStrings 2013-11-05 23:14:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca kling oldest_to_newest 947358 0 andersca 2013-11-05 14:26:37 -0800 Add support for decoding NSStrings 947364 1 216082 andersca 2013-11-05 14:36:59 -0800 Created attachment 216082 Patch 947377 2 andersca 2013-11-05 14:59:01 -0800 Committed r158696: <http://trac.webkit.org/changeset/158696> 947561 3 ap 2013-11-05 23:14:01 -0800 This broke an API test. Not rolling out yet, because this doesn't break EWS bots, but please take a look as soon as practical. Didn't this change need an API test of its own? [ RUN ] WebKit2.WKRemoteObjectRegistryTest 2013-11-05 16:31:56.021 TestWebKitAPI[30561:f07] An uncaught exception was raised 2013-11-05 16:31:56.022 TestWebKitAPI[30561:f07] <NSURLRequest http://www.webkit.org/> does not conform to NSSecureCoding 2013-11-05 16:31:56.032 TestWebKitAPI[30561:f07] ( 0 CoreFoundation 0x00007fff8a426b06 __exceptionPreprocess + 198 1 libobjc.A.dylib 0x00007fff8d7533f0 objc_exception_throw + 43 2 CoreFoundation 0x00007fff8a4268dc +[NSException raise:format:] + 204 3 WebKit2 0x000000010e42e7b4 _ZL12encodeObjectP21WKRemoteObjectEncoderP11objc_object + 244 4 WebKit2 0x000000010e42d666 _ZL19createEncodedObjectP21WKRemoteObjectEncoderP11objc_object + 182 5 WebKit2 0x000000010e42d3a0 _ZL20encodeToObjectStreamP21WKRemoteObjectEncoderP11objc_object + 64 6 WebKit2 0x000000010e42ebb0 _ZL16encodeInvocationP21WKRemoteObjectEncoderP12NSInvocation + 560 7 WebKit2 0x000000010e42e75d _ZL12encodeObjectP21WKRemoteObjectEncoderP11objc_object + 157 8 WebKit2 0x000000010e42d666 _ZL19createEncodedObjectP21WKRemoteObjectEncoderP11objc_object + 182 9 WebKit2 0x000000010e42d480 -[WKRemoteObjectEncoder encodeObject:forKey:] + 80 10 WebKit2 0x000000010e337527 -[WKRemoteObjectRegistry _sendInvocation:interface:] + 247 11 WebKit2 0x000000010e5cdb06 -[WKRemoteObject forwardInvocation:] + 102 12 CoreFoundation 0x00007fff8a415197 ___forwarding___ + 775 13 CoreFoundation 0x00007fff8a414e18 _CF_forwarding_prep_0 + 232 14 TestWebKitAPI 0x000000010c14f9bf _ZN13TestWebKitAPI39WebKit2_WKRemoteObjectRegistryTest_Test8TestBodyEv + 2383 15 TestWebKitAPI 0x000000010c1601da _ZN7testing4Test3RunEv + 154 16 TestWebKitAPI 0x000000010c160bfd _ZN7testing8internal12TestInfoImpl3RunEv + 189 17 TestWebKitAPI 0x000000010c1617dd _ZN7testing8TestCase3RunEv + 205 18 TestWebKitAPI 0x000000010c167627 _ZN7testing8internal12UnitTestImpl11RunAllTestsEv + 935 19 TestWebKitAPI 0x000000010c167279 _ZN7testing8UnitTest3RunEv + 25 20 TestWebKitAPI 0x000000010c135520 _ZN13TestWebKitAPI15TestsController3runEiPPc + 48 21 TestWebKitAPI 0x000000010c156af5 main + 165 22 libdyld.dylib 0x00007fff8b8e77e1 start + 0 216082 2013-11-05 14:36:59 -0800 2013-11-05 14:52:22 -0800 Patch bug-123829-20131105143658.patch text/plain 10665 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGNjOGRmMDU5NjY2YTJi MjAyYzE0ZjgxN2JmNGRkMDY3ODcwOWQ2Yy4uYWRlNWI1OWIzYjNlMzE4NjYxOTBkODdkOTgxNzBh ZjdmYTE0MjYyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU1IEBACiAyMDEzLTExLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIGRlY29kaW5nIE5TU3RyaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIzODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBTaGFyZWQvQVBJL0NvY29hL1dLUmVtb3RlT2JqZWN0Q29kZXIubW06 CisgICAgICAgIChlbmNvZGVPYmplY3QpOgorICAgICAgICAoLVtXS1JlbW90ZU9iamVjdERlY29k ZXIgYWxsb3dzS2V5ZWRDb2RpbmddKToKKyAgICAgICAgQWx3YXlzIHJldHVybiBZRVMuCisKKyAg ICAgICAgKC1bV0tSZW1vdGVPYmplY3REZWNvZGVyIGNvbnRhaW5zVmFsdWVGb3JLZXk6XSk6Cisg ICAgICAgIExvb2sgdXAgdGhlIGtleSBpbiB0aGUgY3VycmVudCBkaWN0aW9uYXJ5LgorCisgICAg ICAgICgtW1dLUmVtb3RlT2JqZWN0RGVjb2RlciBkZWNvZGVCeXRlc0ZvcktleTpyZXR1cm5lZExl bmd0aDpdKToKKyAgICAgICAgVHJ5IHRvIGdldCB0aGUgV2ViRGF0YSBvYmplY3QgYW5kIHJldHVy biBpdHMgZGF0YSArIHNpemUuCisKKyAgICAgICAgKC1bV0tSZW1vdGVPYmplY3REZWNvZGVyIHJl cXVpcmVzU2VjdXJlQ29kaW5nXSk6CisgICAgICAgIFJldHVybiBZRVMuCisKKyAgICAgICAgKGNo ZWNrSWZDbGFzc0lzQWxsb3dlZCk6CisgICAgICAgIENoZWNrIGlmIHRoZSBjbGFzcyBvciBhbnkg b2YgaXRzIHN1cGVyY2xhc3NlcyBhcmUgYXJlIGFsbG93ZWQuCisKKyAgICAgICAgKHZhbGlkYXRl Q2xhc3MpOgorICAgICAgICBDYWxsIGNoZWNrSWZDbGFzc0lzQWxsb3dlZCBhbmQgdmFsaWRhdGUg dGhhdCB0aGUgY2xhc3MgY29uZm9ybXMgdG8gTlNTZWN1cmVDb2RpbmcuCisKKyAgICAgICAgKGRl Y29kZU9iamVjdCk6CisgICAgICAgIEdldCB0aGUgY2xhc3MgbmFtZSwgdmVyaWZ5IHRoYXQgdGhl IGNsYXNzIGV4aXN0cyBhbmQgaXMgYWxsb3dlZC4gCisgICAgICAgIEFsbG9jYXRlIGFuZCBpbml0 aWFsaXplIGFuIG9iamVjdCB1c2luZyBpbml0V2l0aENvZGVyOi4KKworICAgICAgICAoLVtXS1Jl bW90ZU9iamVjdERlY29kZXIgZGVjb2RlT2JqZWN0T2ZDbGFzc2VzOmZvcktleTpdKToKKyAgICAg ICAgU2V0IHRoZSBhbGxvd2VkIGNsYXNzZXMsIGxvb2sgdXAgdGhlIG9iamVjdCBpbiBfY3VycmVu dERpY3Rpb25hcnkgYW5kIGNhbGwgZGVjb2RlT2JqZWN0LgorCisgICAgICAgICgtW1dLUmVtb3Rl T2JqZWN0RGVjb2RlciBhbGxvd2VkQ2xhc3Nlc10pOgorICAgICAgICBSZXR1cm4gX2FsbG93ZWRD bGFzc2VzLgorCisgICAgICAgICogU2hhcmVkL0FQSS9Db2NvYS9XS1JlbW90ZU9iamVjdFJlZ2lz dHJ5Lm1tOgorICAgICAgICAoLVtXS1JlbW90ZU9iamVjdFJlZ2lzdHJ5IF9zZW5kSW52b2NhdGlv bjppbnRlcmZhY2U6XSk6CisgICAgICAgIERlY2xhcmUgaW50ZXJmYWNlSWRlbnRpZmllciBhcyBh IGNvbnN0YW50LgorCisgICAgICAgICgtW1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkgX2ludm9rZU1l c3NhZ2VXaXRoQm9keTpdKToKKyAgICAgICAgRGVjb2RlIHRoZSBpbnRlcmZhY2UgaWRlbnRpZmll ci4KKworICAgICAgICAqIFNoYXJlZC9JbW11dGFibGVEaWN0aW9uYXJ5Lmg6CisgICAgICAgIChX ZWJLaXQ6OkltbXV0YWJsZURpY3Rpb25hcnk6OmdldCk6CisgICAgICAgIChXZWJLaXQ6OkltbXV0 YWJsZURpY3Rpb25hcnk6OnNpemUpOgorICAgICAgICAoV2ViS2l0OjpJbW11dGFibGVEaWN0aW9u YXJ5OjptYXApOgorICAgICAgICBNYWtlIG1lbWJlciBmdW5jdGlvbnMgY29uc3QuCisKKzIwMTMt MTEtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBC ZWdpbiB3b3JrIG9uIGEgV0tSZW1vdGVPYmplY3REZWNvZGVyIG9iamVjdAogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzODE5CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvV0tSZW1vdGVPYmplY3RDb2Rlci5tbSBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvV0tSZW1vdGVPYmplY3RDb2Rlci5tbQpp bmRleCBmYzUxZmExOGM0MWRiMDBmNGM0NjEyOGFkZjhiODI2YzhjNjk4NzU5Li4yM2MyODI2Yzhh ZTFjM2VlMGI2Zjk4NDQyMzNlZTNhNmRhZDAxMmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQVBJL0NvY29hL1dLUmVtb3RlT2JqZWN0Q29kZXIubW0KKysrIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL0FQSS9Db2NvYS9XS1JlbW90ZU9iamVjdENvZGVyLm1tCkBAIC0zMiw3ICsz Miw5IEBACiAjaW1wb3J0ICJXZWJOdW1iZXIuaCIKICNpbXBvcnQgIldlYlN0cmluZy5oIgogI2lt cG9ydCA8b2JqYy9ydW50aW1lLmg+CisjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0 IDx3dGYvVGVtcG9yYXJ5Q2hhbmdlLmg+CisjaW1wb3J0IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAK ICNpZiBXS19BUElfRU5BQkxFRAogCkBAIC00Nyw2ICs0OSwxMCBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxJbW11dGFibGVEaWN0aW9uYXJ5PiBjcmVhdGVFbmNvZGVkT2JqZWN0KFdLUmVtb3RlT2JqZWN0 RW5jb2RlcgogLSAoTlNTdHJpbmcgKilfdHlwZVN0cmluZzsKIEBlbmQKIAorQGludGVyZmFjZSBO U0NvZGVyIChEZXRhaWxzKQorLSAodm9pZCl2YWxpZGF0ZUNsYXNzU3VwcG9ydHNTZWN1cmVDb2Rp bmc6KENsYXNzKW9iamVjdENsYXNzOworQGVuZAorCiBAaW1wbGVtZW50YXRpb24gV0tSZW1vdGVP YmplY3RFbmNvZGVyIHsKICAgICBSZWZQdHI8TXV0YWJsZURpY3Rpb25hcnk+IF9yb290RGljdGlv bmFyeTsKICAgICBNdXRhYmxlQXJyYXkqIF9vYmplY3RTdHJlYW07CkBAIC0xNzYsMTEgKzE4Miwx MSBAQCBzdGF0aWMgdm9pZCBlbmNvZGVPYmplY3QoV0tSZW1vdGVPYmplY3RFbmNvZGVyICplbmNv ZGVyLCBpZCBvYmplY3QpCiAgICAgaWYgKGNsYXNzX2lzTWV0YUNsYXNzKG9iamVjdF9nZXRDbGFz cyhvYmplY3QpKSkKICAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50 RXhjZXB0aW9uIGZvcm1hdDpAIkNsYXNzIG9iamVjdHMgbWF5IG5vdCBiZSBlbmNvZGVkIl07CiAK LSAgICBDbGFzcyBjbHMgPSBbb2JqZWN0IGNsYXNzRm9yQ29kZXJdOwotICAgIGlmICghY2xzKQor ICAgIENsYXNzIG9iamVjdENsYXNzID0gW29iamVjdCBjbGFzc0ZvckNvZGVyXTsKKyAgICBpZiAo IW9iamVjdENsYXNzKQogICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1l bnRFeGNlcHRpb24gZm9ybWF0OkAiLWNsYXNzRm9yQ29kZXIgcmV0dXJuZWQgbmlsIGZvciAlQCIs IG9iamVjdF07CiAKLSAgICBlbmNvZGVyLT5fY3VycmVudERpY3Rpb25hcnktPnNldChjbGFzc05h bWVLZXksIFdlYlN0cmluZzo6Y3JlYXRlKGNsYXNzX2dldE5hbWUoY2xzKSkpOworICAgIGVuY29k ZXItPl9jdXJyZW50RGljdGlvbmFyeS0+c2V0KGNsYXNzTmFtZUtleSwgV2ViU3RyaW5nOjpjcmVh dGUoY2xhc3NfZ2V0TmFtZShvYmplY3RDbGFzcykpKTsKICAgICBbb2JqZWN0IGVuY29kZVdpdGhD b2RlcjplbmNvZGVyXTsKIH0KIApAQCAtMjU4LDYgKzI2NCw4IEBAIHN0YXRpYyBOU1N0cmluZyAq ZXNjYXBlS2V5KE5TU3RyaW5nICprZXkpCiBAaW1wbGVtZW50YXRpb24gV0tSZW1vdGVPYmplY3RE ZWNvZGVyIHsKICAgICBSZWZQdHI8SW1tdXRhYmxlRGljdGlvbmFyeT4gX3Jvb3REaWN0aW9uYXJ5 OwogICAgIGNvbnN0IEltbXV0YWJsZURpY3Rpb25hcnkqIF9jdXJyZW50RGljdGlvbmFyeTsKKwor ICAgIE5TU2V0ICpfYWxsb3dlZENsYXNzZXM7CiB9CiAKIC0gKGlkKWluaXRXaXRoUm9vdE9iamVj dERpY3Rpb25hcnk6KEltbXV0YWJsZURpY3Rpb25hcnkqKXJvb3RPYmplY3REaWN0aW9uYXJ5CkBA IC0yNzEsNiArMjc5LDEwOCBAQCBzdGF0aWMgTlNTdHJpbmcgKmVzY2FwZUtleShOU1N0cmluZyAq a2V5KQogICAgIHJldHVybiBzZWxmOwogfQogCistIChCT09MKWFsbG93c0tleWVkQ29kaW5nCit7 CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAoQk9PTCljb250YWluc1ZhbHVlRm9yS2V5OihOU1N0 cmluZyAqKWtleQoreworICAgIHJldHVybiBfY3VycmVudERpY3Rpb25hcnktPm1hcCgpLmNvbnRh aW5zKGVzY2FwZUtleShrZXkpKTsKK30KKworLSAoY29uc3QgdWludDhfdCAqKWRlY29kZUJ5dGVz Rm9yS2V5OihOU1N0cmluZyAqKWtleSByZXR1cm5lZExlbmd0aDooTlNVSW50ZWdlciAqKWxlbmd0 aAoreworICAgIFdlYkRhdGEqIGRhdGEgPSBfY3VycmVudERpY3Rpb25hcnktPmdldDxXZWJEYXRh Pihlc2NhcGVLZXkoa2V5KSk7CisgICAgaWYgKCFkYXRhIHx8ICFkYXRhLT5zaXplKCkpCisgICAg ICAgIHJldHVybiBudWxscHRyOworCisgICAgKmxlbmd0aCA9IGRhdGEtPnNpemUoKTsKKyAgICBy ZXR1cm4gZGF0YS0+Ynl0ZXMoKTsKK30KKworLSAoQk9PTClyZXF1aXJlc1NlY3VyZUNvZGluZwor eworICAgIHJldHVybiBZRVM7Cit9CisKK3N0YXRpYyB2b2lkIGNoZWNrSWZDbGFzc0lzQWxsb3dl ZChXS1JlbW90ZU9iamVjdERlY29kZXIgKmRlY29kZXIsIENsYXNzIG9iamVjdENsYXNzKQorewor ICAgIE5TU2V0ICphbGxvd2VkQ2xhc3NlcyA9IGRlY29kZXItPl9hbGxvd2VkQ2xhc3NlczsKKwor ICAgIC8vIENoZWNrIGlmIHRoZSBjbGFzcyBvciBhbnkgb2YgaXRzIHN1cGVyY2xhc3NlcyBhcmUg aW4gdGhlIGFsbG93ZWQgY2xhc3NlcyBzZXQuCisgICAgZm9yIChDbGFzcyBjbHMgPSBvYmplY3RD bGFzczsgY2xzOyBjbHMgPSBjbGFzc19nZXRTdXBlcmNsYXNzKGNscykpIHsKKyAgICAgICAgaWYg KFthbGxvd2VkQ2xhc3NlcyBjb250YWluc09iamVjdDpjbHNdKQorICAgICAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRVbmFyY2hpdmVPcGVy YXRpb25FeGNlcHRpb24gZm9ybWF0OkAiT2JqZWN0IG9mIGNsYXNzIFwiJUBcIiBpcyBub3QgYWxs b3dlZC4gQWxsb3dlZCBjbGFzc2VzIGFyZSBcIiVAXCIiLCBvYmplY3RDbGFzcywgYWxsb3dlZENs YXNzZXNdOworfQorCitzdGF0aWMgdm9pZCB2YWxpZGF0ZUNsYXNzKFdLUmVtb3RlT2JqZWN0RGVj b2RlciAqZGVjb2RlciwgQ2xhc3Mgb2JqZWN0Q2xhc3MpCit7CisgICAgQVNTRVJUKG9iamVjdENs YXNzKTsKKworICAgIGNoZWNrSWZDbGFzc0lzQWxsb3dlZChkZWNvZGVyLCBvYmplY3RDbGFzcyk7 CisKKyAgICAvLyBOU0ludm9jYXRpb24gZG9lc24ndCBzdXBwb3J0IE5TU2VjdXJlQ29kaW5nLCBi dXQgd2UgYWxsb3cgaXQgYW55d2F5LgorICAgIGlmIChvYmplY3RDbGFzcyA9PSBbTlNJbnZvY2F0 aW9uIGNsYXNzXSkKKyAgICAgICAgcmV0dXJuOworCisgICAgW2RlY29kZXIgdmFsaWRhdGVDbGFz c1N1cHBvcnRzU2VjdXJlQ29kaW5nOm9iamVjdENsYXNzXTsKK30KKworc3RhdGljIGlkIGRlY29k ZU9iamVjdChXS1JlbW90ZU9iamVjdERlY29kZXIgKmRlY29kZXIpCit7CisgICAgV2ViU3RyaW5n KiBjbGFzc05hbWVTdHJpbmcgPSBkZWNvZGVyLT5fY3VycmVudERpY3Rpb25hcnktPmdldDxXZWJT dHJpbmc+KGNsYXNzTmFtZUtleSk7CisgICAgaWYgKCFjbGFzc05hbWVTdHJpbmcpCisgICAgICAg IFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRVbmFyY2hpdmVPcGVyYXRpb25FeGNlcHRpb24g Zm9ybWF0OkAiQ2xhc3MgbmFtZSBtaXNzaW5nIl07CisKKyAgICBDU3RyaW5nIGNsYXNzTmFtZSA9 IGNsYXNzTmFtZVN0cmluZy0+c3RyaW5nKCkudXRmOCgpOworCisgICAgQ2xhc3Mgb2JqZWN0Q2xh c3MgPSBvYmpjX2xvb2tVcENsYXNzKGNsYXNzTmFtZS5kYXRhKCkpOworICAgIGlmICghb2JqZWN0 Q2xhc3MpCisgICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRVbmFyY2hpdmVPcGVy YXRpb25FeGNlcHRpb24gZm9ybWF0OkAiQ2xhc3MgXCIlc1wiIGRvZXMgbm90IGV4aXN0IiwgY2xh c3NOYW1lLmRhdGEoKV07CisKKyAgICB2YWxpZGF0ZUNsYXNzKGRlY29kZXIsIG9iamVjdENsYXNz KTsKKworICAgIFJldGFpblB0cjxpZD4gcmVzdWx0ID0gW29iamVjdENsYXNzIGFsbG9jXTsKKyAg ICBpZiAoIXJlc3VsdCkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZFVuYXJj aGl2ZU9wZXJhdGlvbkV4Y2VwdGlvbiBmb3JtYXQ6QCJDbGFzcyBcIiVzXCIgcmV0dXJuZWQgbmls IGZyb20gK2FsbG9jIHdoaWxlIGJlaW5nIGRlY29kZWQiLCBjbGFzc05hbWUuZGF0YSgpXTsKKwor ICAgIHJlc3VsdCA9IFtyZXN1bHQgaW5pdFdpdGhDb2RlcjpkZWNvZGVyXTsKKyAgICBpZiAoIXJl c3VsdCkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZFVuYXJjaGl2ZU9wZXJh dGlvbkV4Y2VwdGlvbiBmb3JtYXQ6QCJPYmplY3Qgb2YgY2xhc3MgXCIlc1wiIHJldHVybmVkIG5p bCBmcm9tIC1pbml0V2l0aENvZGVyOiB3aGlsZSBiZWluZyBkZWNvZGVkIiwgY2xhc3NOYW1lLmRh dGEoKV07CisKKyAgICByZXN1bHQgPSBbcmVzdWx0IGF3YWtlQWZ0ZXJVc2luZ0NvZGVyOmRlY29k ZXJdOworICAgIGlmICghcmVzdWx0KQorICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZh bGlkVW5hcmNoaXZlT3BlcmF0aW9uRXhjZXB0aW9uIGZvcm1hdDpAIk9iamVjdCBvZiBjbGFzcyBc IiVzXCIgcmV0dXJuZWQgbmlsIGZyb20gLWF3YWtlQWZ0ZXJVc2luZ0NvZGVyOiB3aGlsZSBiZWlu ZyBkZWNvZGVkIiwgY2xhc3NOYW1lLmRhdGEoKV07CisKKyAgICByZXR1cm4gW3Jlc3VsdC5sZWFr UmVmKCkgYXV0b3JlbGVhc2VdOworfQorCitzdGF0aWMgaWQgZGVjb2RlT2JqZWN0KFdLUmVtb3Rl T2JqZWN0RGVjb2RlciAqZGVjb2RlciwgY29uc3QgSW1tdXRhYmxlRGljdGlvbmFyeSogZGljdGlv bmFyeSkKK3sKKyAgICBpZiAoIWRpY3Rpb25hcnkpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAg ICBUZW1wb3JhcnlDaGFuZ2U8Y29uc3QgSW1tdXRhYmxlRGljdGlvbmFyeSo+IGRpY3Rpb25hcnlD aGFuZ2UoZGVjb2Rlci0+X2N1cnJlbnREaWN0aW9uYXJ5LCBkaWN0aW9uYXJ5KTsKKworICAgIHJl dHVybiBkZWNvZGVPYmplY3QoZGVjb2Rlcik7Cit9CisKKy0gKGlkKWRlY29kZU9iamVjdE9mQ2xh c3NlczooTlNTZXQgKiljbGFzc2VzIGZvcktleTooTlNTdHJpbmcgKilrZXkKK3sKKyAgICBUZW1w b3JhcnlDaGFuZ2U8TlNTZXQgKj4gYWxsb3dlZENsYXNzZXNDaGFuZ2UoX2FsbG93ZWRDbGFzc2Vz LCBjbGFzc2VzKTsKKworICAgIHJldHVybiBkZWNvZGVPYmplY3Qoc2VsZiwgX2N1cnJlbnREaWN0 aW9uYXJ5LT5nZXQ8SW1tdXRhYmxlRGljdGlvbmFyeT4oZXNjYXBlS2V5KGtleSkpKTsKK30KKwor LSAoTlNTZXQgKilhbGxvd2VkQ2xhc3NlcworeworICAgIHJldHVybiBfYWxsb3dlZENsYXNzZXM7 Cit9CisKIEBlbmQKIAogI2VuZGlmIC8vIFdLX0FQSV9FTkFCTEVECmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQVBJL0NvY29hL1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0gYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL0NvY29hL1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0K aW5kZXggMzc2MzYzZGRhOWZlMzE4NjljNDM3OGY4MDZjNThjYjI4MGRmYTEzNC4uMDFhOWM2OTAy ZmMxZGNkNDIxMGVhMTIzNWY3N2YwZDI1MGYzZGIxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL0FQSS9Db2NvYS9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvV0tSZW1vdGVPYmplY3RSZWdpc3RyeS5tbQpAQCAt MzksNiArMzksOCBAQAogCiBjb25zdCBjaGFyKiBjb25zdCBtZXNzYWdlTmFtZSA9ICJXS1JlbW90 ZU9iamVjdFJlZ2lzdHJ5TWVzc2FnZSI7CiAKK05TU3RyaW5nICogY29uc3QgaW50ZXJmYWNlSWRl bnRpZmllcktleSA9IEAiaW50ZXJmYWNlSWRlbnRpZmllciI7CisKIHVzaW5nIG5hbWVzcGFjZSBX ZWJLaXQ7CiAKIEBpbXBsZW1lbnRhdGlvbiBXS1JlbW90ZU9iamVjdFJlZ2lzdHJ5IHsKQEAgLTc1 LDcgKzc3LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIHsKICAgICBSZXRhaW5QdHI8V0tS ZW1vdGVPYmplY3RFbmNvZGVyPiBlbmNvZGVyID0gYWRvcHROUyhbW1dLUmVtb3RlT2JqZWN0RW5j b2RlciBhbGxvY10gaW5pdF0pOwogCi0gICAgW2VuY29kZXIgZW5jb2RlT2JqZWN0OmludGVyZmFj ZS5pZGVudGlmaWVyIGZvcktleTpAImludGVyZmFjZUlkZW50aWZpZXIiXTsKKyAgICBbZW5jb2Rl ciBlbmNvZGVPYmplY3Q6aW50ZXJmYWNlLmlkZW50aWZpZXIgZm9yS2V5OmludGVyZmFjZUlkZW50 aWZpZXJLZXldOwogICAgIFtlbmNvZGVyIGVuY29kZU9iamVjdDppbnZvY2F0aW9uIGZvcktleTpA Imludm9jYXRpb24iXTsKIAogICAgIFtzZWxmIF9zZW5kTWVzc2FnZVdpdGhCb2R5OltlbmNvZGVy IHJvb3RPYmplY3REaWN0aW9uYXJ5XV07CkBAIC0xMTYsNyArMTE4LDE2IEBAIHVzaW5nIG5hbWVz cGFjZSBXZWJLaXQ7CiB7CiAgICAgUmV0YWluUHRyPFdLUmVtb3RlT2JqZWN0RGVjb2Rlcj4gZGVj b2RlciA9IGFkb3B0TlMoW1tXS1JlbW90ZU9iamVjdERlY29kZXIgYWxsb2NdIGluaXRXaXRoUm9v dE9iamVjdERpY3Rpb25hcnk6Ym9keV0pOwogCi0gICAgLy8gRklYTUU6IEFjdHVhbGx5IGRlY29k ZSB0aGUgaW52b2NhdGlvbi4KKyAgICBOU1N0cmluZyAqaW50ZXJmYWNlSWRlbnRpZmllciA9IG5p bDsKKworICAgIC8vIEZJWE1FOiBEZWNvZGUgdGhlIGludm9jYXRpb24uCisgICAgQHRyeSB7Cisg ICAgICAgIGludGVyZmFjZUlkZW50aWZpZXIgPSBbZGVjb2RlciBkZWNvZGVPYmplY3RPZkNsYXNz OltOU1N0cmluZyBjbGFzc10gZm9yS2V5OmludGVyZmFjZUlkZW50aWZpZXJLZXldOworICAgIH0g QGNhdGNoIChOU0V4Y2VwdGlvbiAqZXhjZXB0aW9uKSB7CisgICAgICAgIE5TTG9nKEAiRXhjZXB0 aW9uIGNhdWdodCBkdXJpbmcgZGVjb2Rpbmcgb2YgbWVzc2FnZTogJUAiLCBleGNlcHRpb24pOwor ICAgIH0KKworICAgIC8vIEZJWE1FOiBJbnZva2UgdGhlIGludm9jYXRpb24uCiB9CiAKIEBlbmQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9JbW11dGFibGVEaWN0aW9uYXJ5Lmgg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvSW1tdXRhYmxlRGljdGlvbmFyeS5oCmluZGV4IGUyYTFm ODhmMTIxMmJiYzAzNWRjMGIyYzVkMGZlM2QyNWI2NGU1YzEuLmMzODBkMzNlMDE5NTZiODg5OTU1 NDM5NDFkNDFlNTFjMDEzMGYyZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9J bW11dGFibGVEaWN0aW9uYXJ5LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0ltbXV0YWJs ZURpY3Rpb25hcnkuaApAQCAtNTYsNyArNTYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IGlzTXV0YWJsZSgpIHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBU PgotICAgIFQqIGdldChjb25zdCBTdHJpbmcmIGtleSkKKyAgICBUKiBnZXQoY29uc3QgU3RyaW5n JiBrZXkpIGNvbnN0CiAgICAgewogICAgICAgICBSZWZQdHI8QVBJT2JqZWN0PiBpdGVtID0gbV9t YXAuZ2V0KGtleSk7CiAgICAgICAgIGlmICghaXRlbSkKQEAgLTY4LDIzICs2OCwyMyBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxUKj4oaXRlbS5nZXQoKSk7CiAgICAgfQog Ci0gICAgQVBJT2JqZWN0KiBnZXQoY29uc3QgU3RyaW5nJiBrZXkpCisgICAgQVBJT2JqZWN0KiBn ZXQoY29uc3QgU3RyaW5nJiBrZXkpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9tYXAu Z2V0KGtleSk7CiAgICAgfQogCi0gICAgQVBJT2JqZWN0KiBnZXQoY29uc3QgU3RyaW5nJiBrZXks IGJvb2wmIGV4aXN0cykKKyAgICBBUElPYmplY3QqIGdldChjb25zdCBTdHJpbmcmIGtleSwgYm9v bCYgZXhpc3RzKSBjb25zdAogICAgIHsKLSAgICAgICAgY29uc3QgYXV0byYgaXQgPSBtX21hcC5m aW5kKGtleSk7CisgICAgICAgIGF1dG8gaXQgPSBtX21hcC5maW5kKGtleSk7CiAgICAgICAgIGV4 aXN0cyA9IGl0ICE9IG1fbWFwLmVuZCgpOwogICAgICAgICByZXR1cm4gaXQtPnZhbHVlLmdldCgp OwogICAgIH0KIAogICAgIFBhc3NSZWZQdHI8SW1tdXRhYmxlQXJyYXk+IGtleXMoKSBjb25zdDsK IAotICAgIHNpemVfdCBzaXplKCkgeyByZXR1cm4gbV9tYXAuc2l6ZSgpOyB9CisgICAgc2l6ZV90 IHNpemUoKSBjb25zdCB7IHJldHVybiBtX21hcC5zaXplKCk7IH0KIAotICAgIGNvbnN0IE1hcFR5 cGUmIG1hcCgpIHsgcmV0dXJuIG1fbWFwOyB9CisgICAgY29uc3QgTWFwVHlwZSYgbWFwKCkgY29u c3QgeyByZXR1cm4gbV9tYXA7IH0KIAogcHJvdGVjdGVkOgogICAgIEltbXV0YWJsZURpY3Rpb25h cnkoKTsK