196504 2019-04-02 11:56:43 -0700 NSAttributedString crashes when encoding text attachment cell for missing image 2019-04-02 14:06:56 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bdakin commit-queue ews-watchlist ggaren thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1523387 0 timothy 2019-04-02 11:56:43 -0700 Crashing on exception: This decoder will only decode classes that adopt NSSecureCoding. Class 'NSTextAttachmentCell' does not adopt it. Application Specific Backtrace 1: 0 CoreFoundation 0x7fff3abd1867 __exceptionPreprocess + 250 (ObjC.subproj/NSException.m:199) 1 libobjc.A.dylib 0x7fff6f6e435f objc_exception_throw + 48 (runtime/objc-exception.mm:565) 2 Foundation 0x7fff3d30dc78 -[NSCoder(Exceptions) __failWithException:] + 174 (ObjC.subproj/NSCoder.m:0) 3 Foundation 0x7fff3d30ddf9 -[NSCoder(Exceptions) __failWithExceptionName:errorCode:format:] + 385 (ObjC.subproj/NSCoder.m:630) 4 Foundation 0x7fff3d1d9836 -[NSCoder validateClassSupportsSecureCoding:] + 313 (ObjC.subproj/NSCoder.m:0) 5 Foundation 0x7fff3d203f39 _encodeObject + 406 (Persistence.subproj/NSKeyedArchiver.m:266) 6 Foundation 0x7fff3d204261 _encodeObject + 1214 (Persistence.subproj/NSKeyedArchiver.m:1037) 7 Foundation 0x7fff3d205303 -[NSKeyedArchiver _encodeArrayOfObjects:forKey:] + 364 (Persistence.subproj/NSKeyedArchiver.m:1082) 8 Foundation 0x7fff3d1e743b -[NSDictionary(NSDictionary) encodeWithCoder:] + 885 (Collections.subproj/NSDictionary_Foundation.m:43) 9 Foundation 0x7fff3d204261 _encodeObject + 1214 (Persistence.subproj/NSKeyedArchiver.m:1037) 10 Foundation 0x7fff3d205303 -[NSKeyedArchiver _encodeArrayOfObjects:forKey:] + 364 (Persistence.subproj/NSKeyedArchiver.m:1082) 11 Foundation 0x7fff3d204261 _encodeObject + 1214 (Persistence.subproj/NSKeyedArchiver.m:1037) 12 Foundation 0x7fff3d27504a -[NSAttributedString encodeWithCoder:] + 1040 (String.subproj/NSAttributedString.m:478) 13 Foundation 0x7fff3d204261 _encodeObject + 1214 (Persistence.subproj/NSKeyedArchiver.m:1037) 14 WebKit 0x000000010b888a29 _ZN3IPC12encodeObjectERNS_7EncoderEP11objc_object + 1942 15 WebKit 0x000000010b8a3625 _ZN3IPC13ArgumentCoderIN6WebKit16AttributedStringEE6encodeERNS_7EncoderERKS2_ + 21 16 WebKit 0x000000010bb5f7d8 _ZN8Messages7WebPage29GetContentsAsAttributedString4sendEONSt3__110unique_ptrIN3IPC7EncoderENS2_14default_deleteIS5_EEEERNS4_10ConnectionERKN6WebKit16AttributedStringE + 32 17 WebKit 0x000000010bb6ba49 _ZN3WTF8FunctionIFvRKN6WebKit16AttributedStringEEE15CallableWrapperIZN3IPC18handleMessageAsyncIN8Messages7WebPage29GetContentsAsAttributedStringENS1_7WebPageEMSD_FvONS_17CompletionHandlerIS5_EEEEEvRNS8_10ConnectionERNS8_7DecoderEPT0_T1_EUlDpOT_E_E4callES4_ + 107 18 WebKit 0x000000010ba7c4ce _ZN3WTF17CompletionHandlerIFvRKN6WebKit16AttributedStringEEEclES4_ + 26 19 WebKit 0x000000010ba7c401 _ZN6WebKit7WebPage29getContentsAsAttributedStringEON3WTF17CompletionHandlerIFvRKNS_16AttributedStringEEEE + 199 20 WebKit 0x000000010bb66242 _ZN3IPC18handleMessageAsyncIN8Messages7WebPage29GetContentsAsAttributedStringEN6WebKit7WebPageEMS5_FvON3WTF17CompletionHandlerIFvRKNS4_16AttributedStringEEEEEEEvRNS_10ConnectionERNS_7DecoderEPT0_T1_ + 133 21 WebKit 0x000000010b78332a _ZN3IPC18MessageReceiverMap15dispatchMessageERNS_10ConnectionERNS_7DecoderE + 114 22 WebKit 0x000000010ba8e78a _ZN6WebKit10WebProcess17didReceiveMessageERN3IPC10ConnectionERNS1_7DecoderE + 28 23 WebKit 0x000000010b774928 _ZN3IPC10Connection15dispatchMessageENSt3__110unique_ptrINS_7DecoderENS1_14default_deleteIS3_EEEE + 108 24 WebKit 0x000000010b7781e9 _ZN3IPC10Connection26dispatchOneIncomingMessageEv + 181 25 JavaScriptCore 0x00000007c3799b04 _ZN3WTF7RunLoop11performWorkEv + 228 26 JavaScriptCore 0x00000007c3799d92 _ZN3WTF7RunLoop11performWorkEPv + 34 <rdar://problem/49161281> 1523393 1 366518 timothy 2019-04-02 12:14:15 -0700 Created attachment 366518 Patch 1523394 2 366519 timothy 2019-04-02 12:15:16 -0700 Created attachment 366519 Patch 1523397 3 366522 timothy 2019-04-02 12:18:14 -0700 Created attachment 366522 Patch 1523400 4 ews-watchlist 2019-04-02 12:22:12 -0700 Attachment 366522 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:13: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:14: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:15: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:17: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:19: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebCore/ChangeLog:20: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 6 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1523403 5 366522 thorton 2019-04-02 12:31:49 -0700 Comment on attachment 366522 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366522&action=review > Source/WebCore/editing/cocoa/HTMLConverter.mm:1342 > + NSBundle *webCoreBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebCore"]; We don't have a function for this? 1523431 6 366522 timothy 2019-04-02 13:39:46 -0700 Comment on attachment 366522 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366522&action=review >> Source/WebCore/editing/cocoa/HTMLConverter.mm:1342 >> + NSBundle *webCoreBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebCore"]; > > We don't have a function for this? Not that I could find. 1523454 7 366522 commit-queue 2019-04-02 14:06:55 -0700 Comment on attachment 366522 Patch Clearing flags on attachment: 366522 Committed r243758: <https://trac.webkit.org/changeset/243758> 1523455 8 commit-queue 2019-04-02 14:06:56 -0700 All reviewed patches have been landed. Closing bug. 366518 2019-04-02 12:14:15 -0700 2019-04-02 12:15:15 -0700 Patch bug-196504-20190402121411.patch text/plain 5244 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZiMmM4ODZkZDQ5ODNj N2NlOWUyZjQxNTFhZWEyZjhiYmViZWY2My4uNjYzMzJiMzI1ZmNjMzY3ZTdkYWE3ZmZjZWZjNTEw NTVlYTI5YjQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA0LTAyICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBOU0F0dHJpYnV0ZWRT dHJpbmcgY3Jhc2hlcyB3aGVuIGVuY29kaW5nIHRleHQgYXR0YWNobWVudCBjZWxsIGZvciBtaXNz aW5nIGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTY1MDQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDkxNjEyODEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCBhbmQgZml4IGEgY291 cGxlIG9mIGVycm9ycyBhbmQgY3Jhc2hlcyBpbiB0aGUgbWlzc2luZyBpbWFnZSBwYXRoIG9mIG91 cgorICAgICAgICBhdHRyaWJ1dGVkIHN0cmluZyBjb252ZXJ0ZXIuCisKKyAgICAgICAgRml4ZXMg aW5jbHVkZToKKyAgICAgICAgKiBSZW1vdmVkIG1hbnVhbCBjYWxsIHRvIHJlbGVhc2Ugb24gYSBS ZXRhaW5QdHIsIGxlYWRpbmcgdG8gYXV0b3JlbGVhc2UgcG9vbCBjcmFzaC4KKyAgICAgICAgKiBO byBsb25nZXIgdHJ5IHRvIGxvYWQgYW4gaW1hZ2UgdGhhdCBpcyBtaXNzaW5nIG9uIGRpc2sgYW5k IGhhcyBsb25nIGJlZW4gcmVuYW1lZC4KKyAgICAgICAgKiBObyBsb25nZXIgdXNlIGEgTlNUZXh0 QXR0YWNobWVudENlbGwgaW4gdGhlIE1hYyBjb2RlIHBhdGggd2hpY2ggY2FuJ3QgYmUgZW5jb2Rl ZAorICAgICAgICAgIGZvciBzZW5kaW5nIHRvIHRoZSBVSVByb2Nlc3MsIHNvIGl0IHdhcyBwcmV0 dHkgdXNlbGVzcyBpbiB0aGUgd2ViIGNvbnRlbnQgcHJvY2Vzcy4KKyAgICAgICAgKiBTdG9wcGVk IHVzaW5nIE5TRmlsZVdyYXBwZXIgZm9yIHRoZSBtaXNzaW5nIGltYWdlIHNvIHRoZSBhdHRhY2ht ZW50IGNhbiBjb250YWluIHRoZQorICAgICAgICAgIHJldGluYSB2ZXJzaW9ucyBvZiB0aGUgbWlz c2luZyBpbWFnZS4KKworICAgICAgICAqIGVkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbToK KyAgICAgICAgKEhUTUxDb252ZXJ0ZXI6Ol9hZGRBdHRhY2htZW50Rm9yRWxlbWVudCk6IFVuaWZ5 IGFuZCBzaW1wbGlmeSBtaXNzaW5nIGltYWdlIHBhdGguCisgICAgICAgIChfTlNGaXJzdFBhdGhG b3JEaXJlY3Rvcmllc0luRG9tYWlucyk6IERlbGV0ZWQuCisgICAgICAgIChfTlNTeXN0ZW1MaWJy YXJ5UGF0aCk6IERlbGV0ZWQuCisgICAgICAgIChfd2ViS2l0QnVuZGxlKTogRGVsZXRlZC4KKwog MjAxOS0wNC0wMiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAog ICAgICAgICBbQ01ha2VdIFdFQktJVF9NQUtFX0ZPUldBUkRJTkdfSEVBREVSUyBzaG91bGRuJ3Qg dXNlIFBPU1RfQlVJTEQgdG8gY29weSBnZW5lcmF0ZWQgaGVhZGVycwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCmluZGV4IGU5NGQ5NzhhYjAxZjUwM2Yw YmE1YzFiMmNkYzIwYWRhNDFjNWQ5MjUuLjJjYWY4MTIwODAyZGZlZGUzYjQyNzliNzQ0ZGE1MjRh NDcyZjA1NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvSFRNTENv bnZlcnRlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxDb252ZXJ0 ZXIubW0KQEAgLTk4LDYgKzk4LDcgQEAgU09GVF9MSU5LX0NMQVNTKFVJRm91bmRhdGlvbiwgTlNU ZXh0VGFiKQogI2RlZmluZSBQbGF0Zm9ybU5TQ29sb3JDbGFzcyAgICAgICAgZ2V0TlNDb2xvckNs YXNzKCkKICNkZWZpbmUgUGxhdGZvcm1Gb250ICAgICAgICAgICAgICAgIFVJRm9udAogI2RlZmlu ZSBQbGF0Zm9ybUZvbnRDbGFzcyAgICAgICAgICAgUEFMOjpnZXRVSUZvbnRDbGFzcygpCisjZGVm aW5lIFBsYXRmb3JtSW1hZ2VDbGFzcyAgICAgICAgICBQQUw6OmdldFVJSW1hZ2VDbGFzcygpCiAK ICNlbHNlCiAKQEAgLTExMyw2ICsxMTQsNyBAQCBTT0ZUX0xJTktfQ0xBU1MoVUlGb3VuZGF0aW9u LCBOU1RleHRUYWIpCiAjZGVmaW5lIFBsYXRmb3JtTlNDb2xvckNsYXNzICAgICAgICBOU0NvbG9y CiAjZGVmaW5lIFBsYXRmb3JtRm9udCAgICAgICAgICAgICAgICBOU0ZvbnQKICNkZWZpbmUgUGxh dGZvcm1Gb250Q2xhc3MgICAgICAgICAgIE5TRm9udAorI2RlZmluZSBQbGF0Zm9ybUltYWdlQ2xh c3MgICAgICAgICAgTlNJbWFnZQogCiAjZW5kaWYKIApAQCAtNzcyLDI4ICs3NzQsNiBAQCBib29s IEhUTUxDb252ZXJ0ZXJDYWNoZXM6OmZsb2F0UHJvcGVydHlWYWx1ZUZvck5vZGUoTm9kZSYgbm9k ZSwgQ1NTUHJvcGVydHlJRCBwcgogICAgIHJldHVybiBmYWxzZTsKIH0KIAotI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCi1zdGF0aWMgTlNTdHJpbmcgKl9OU0ZpcnN0UGF0aEZvckRpcmVjdG9yaWVz SW5Eb21haW5zKE5TU2VhcmNoUGF0aERpcmVjdG9yeSBkaXJlY3RvcnksIE5TU2VhcmNoUGF0aERv bWFpbk1hc2sgZG9tYWluTWFzaywgQk9PTCBleHBhbmRUaWxkZSkKLXsKLSAgICBOU0FycmF5ICph cnJheSA9IE5TU2VhcmNoUGF0aEZvckRpcmVjdG9yaWVzSW5Eb21haW5zKGRpcmVjdG9yeSwgZG9t YWluTWFzaywgZXhwYW5kVGlsZGUpOwotICAgIHJldHVybiBbYXJyYXkgY291bnRdID49IDEgPyBb YXJyYXkgb2JqZWN0QXRJbmRleDowXSA6IG5pbDsKLX0KLQotc3RhdGljIE5TU3RyaW5nICpfTlNT eXN0ZW1MaWJyYXJ5UGF0aCh2b2lkKQotewotICAgIHJldHVybiBfTlNGaXJzdFBhdGhGb3JEaXJl Y3Rvcmllc0luRG9tYWlucyhOU0xpYnJhcnlEaXJlY3RvcnksIE5TU3lzdGVtRG9tYWluTWFzaywg WUVTKTsKLX0KLQotc3RhdGljIE5TQnVuZGxlICpfd2ViS2l0QnVuZGxlKCkKLXsKLSAgICAvLyBG SVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgdXNlIHRoZSBXZWJDb3JlIGJ1bmRsZSB0byBhdm9p ZCB0aGUgbGF5ZXJpbmcgdmlvbGF0aW9uLgotICAgIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5k bGUgYnVuZGxlV2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViS2l0Il07Ci0gICAgaWYgKCFi dW5kbGUpCi0gICAgICAgIGJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoUGF0aDpbX05TU3lz dGVtTGlicmFyeVBhdGgoKSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJGcmFtZXdv cmtzL1dlYktpdC5mcmFtZXdvcmsiXV07Ci0gICAgcmV0dXJuIGJ1bmRsZTsKLX0KLSNlbmRpZgot CiBzdGF0aWMgaW5saW5lIE5TU2hhZG93ICpfc2hhZG93Rm9yU2hhZG93U3R5bGUoTlNTdHJpbmcg KnNoYWRvd1N0eWxlKQogewogICAgIE5TU2hhZG93ICpzaGFkb3cgPSBuaWw7CkBAIC0xMzU5LDE5 ICsxMzM5LDE1IEBAIEJPT0wgSFRNTENvbnZlcnRlcjo6X2FkZEF0dGFjaG1lbnRGb3JFbGVtZW50 KEVsZW1lbnQmIGVsZW1lbnQsIE5TVVJMICp1cmwsIEJPT0wKICAgICAgICAgICAgICAgICBbYXR0 YWNobWVudCBzZXRJZ25vcmVzT3JpZW50YXRpb246WUVTXTsKICNlbmRpZgogICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgTlNCdW5kbGUgKndlYkNvcmVCdW5kbGUgPSBbTlNCdW5kbGUgYnVu ZGxlV2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViQ29yZSJdOwogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCi0gICAgICAgICAgICBbYXR0YWNobWVudCByZWxlYXNlXTsKLSAgICAgICAgICAg IE5TVVJMICptaXNzaW5nSW1hZ2VVUkwgPSBbX3dlYktpdEJ1bmRsZSgpIFVSTEZvclJlc291cmNl OkAibWlzc2luZ19pbWFnZSIgd2l0aEV4dGVuc2lvbjpAInRpZmYiXTsKLSAgICAgICAgICAgIEFT U0VSVF9XSVRIX01FU1NBR0UobWlzc2luZ0ltYWdlVVJMICE9IG5pbCwgIlVuYWJsZSB0byBmaW5k IG1pc3NpbmdfaW1hZ2UudGlmZiEiKTsKLSAgICAgICAgICAgIE5TRmlsZVdyYXBwZXIgKm1pc3Np bmdJbWFnZUZpbGVXcmFwcGVyID0gW1tbTlNGaWxlV3JhcHBlciBhbGxvY10gaW5pdFdpdGhVUkw6 bWlzc2luZ0ltYWdlVVJMIG9wdGlvbnM6MCBlcnJvcjpOVUxMXSBhdXRvcmVsZWFzZV07Ci0gICAg ICAgICAgICBhdHRhY2htZW50ID0gW1tQbGF0Zm9ybU5TVGV4dEF0dGFjaG1lbnQgYWxsb2NdIGlu aXRXaXRoRmlsZVdyYXBwZXI6bWlzc2luZ0ltYWdlRmlsZVdyYXBwZXJdOworICAgICAgICAgICAg VUlJbWFnZSAqbWlzc2luZ0ltYWdlID0gW1BsYXRmb3JtSW1hZ2VDbGFzcyBpbWFnZU5hbWVkOkAi bWlzc2luZ0ltYWdlIiBpbkJ1bmRsZTp3ZWJDb3JlQnVuZGxlIGNvbXBhdGlibGVXaXRoVHJhaXRD b2xsZWN0aW9uOm5pbF07CiAjZWxzZQotICAgICAgICAgICAgc3RhdGljIE5TSW1hZ2UgKm1pc3Np bmdJbWFnZSA9IG5pbDsKLSAgICAgICAgICAgIE5TVGV4dEF0dGFjaG1lbnRDZWxsICpjZWxsOwot ICAgICAgICAgICAgY2VsbCA9IFtbTlNUZXh0QXR0YWNobWVudENlbGwgYWxsb2NdIGluaXRJbWFn ZUNlbGw6bWlzc2luZ0ltYWdlXTsKLSAgICAgICAgICAgIFthdHRhY2htZW50IHNldEF0dGFjaG1l bnRDZWxsOmNlbGxdOwotICAgICAgICAgICAgW2NlbGwgcmVsZWFzZV07CisgICAgICAgICAgICBO U0ltYWdlICptaXNzaW5nSW1hZ2UgPSBbd2ViQ29yZUJ1bmRsZSBpbWFnZUZvclJlc291cmNlOkAi bWlzc2luZ0ltYWdlIl07CiAjZW5kaWYKKyAgICAgICAgICAgIEFTU0VSVF9XSVRIX01FU1NBR0Uo bWlzc2luZ0ltYWdlICE9IG5pbCwgIlVuYWJsZSB0byBmaW5kIG1pc3NpbmdJbWFnZS4iKTsKKyAg ICAgICAgICAgIGF0dGFjaG1lbnQgPSBbW1BsYXRmb3JtTlNUZXh0QXR0YWNobWVudCBhbGxvY10g aW5pdFdpdGhEYXRhOm5pbCBvZlR5cGU6bmlsXTsKKyAgICAgICAgICAgIGF0dGFjaG1lbnQuZ2V0 KCkuaW1hZ2UgPSBtaXNzaW5nSW1hZ2U7CiAgICAgICAgIH0KICAgICAgICAgW19hdHRyU3RyIHJl cGxhY2VDaGFyYWN0ZXJzSW5SYW5nZTpyYW5nZVRvUmVwbGFjZSB3aXRoU3RyaW5nOnN0cmluZy5n ZXQoKV07CiAgICAgICAgIHJhbmdlVG9SZXBsYWNlLmxlbmd0aCA9IFtzdHJpbmcgbGVuZ3RoXTsK 366519 2019-04-02 12:15:16 -0700 2019-04-02 12:18:13 -0700 Patch bug-196504-20190402121513.patch text/plain 5327 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZiMmM4ODZkZDQ5ODNj N2NlOWUyZjQxNTFhZWEyZjhiYmViZWY2My4uMDNiNGM0ODJiNGNlZjMwNGYzMTQzYjFjNGQxNGE0 MjkxMDk1MmUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA0LTAyICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBOU0F0dHJpYnV0ZWRT dHJpbmcgY3Jhc2hlcyB3aGVuIGVuY29kaW5nIHRleHQgYXR0YWNobWVudCBjZWxsIGZvciBtaXNz aW5nIGltYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk2NTA0CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzQ5MTYxMjgxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW4gdXAgYW5kIGZpeCBhIGNv dXBsZSBvZiBlcnJvcnMgYW5kIGNyYXNoZXMgaW4gdGhlIG1pc3NpbmcgaW1hZ2UgcGF0aCBvZiBv dXIKKyAgICAgICAgYXR0cmlidXRlZCBzdHJpbmcgY29udmVydGVyLgorCisgICAgICAgIEZpeGVz IGluY2x1ZGU6CisgICAgICAgICogUmVtb3ZlZCBtYW51YWwgY2FsbCB0byByZWxlYXNlIG9uIGEg UmV0YWluUHRyLCBsZWFkaW5nIHRvIGF1dG9yZWxlYXNlIHBvb2wgY3Jhc2guCisgICAgICAgICog Tm8gbG9uZ2VyIHRyeSB0byBsb2FkIGFuIGltYWdlIHRoYXQgaXMgbWlzc2luZyBvbiBkaXNrIGFu ZCBoYXMgbG9uZyBiZWVuIHJlbmFtZWQuCisgICAgICAgICogTm8gbG9uZ2VyIHVzZSBhIE5TVGV4 dEF0dGFjaG1lbnRDZWxsIGluIHRoZSBNYWMgY29kZSBwYXRoIHdoaWNoIGNhbid0IGJlIGVuY29k ZWQKKyAgICAgICAgICBmb3Igc2VuZGluZyB0byB0aGUgVUlQcm9jZXNzLCBzbyBpdCB3YXMgcHJl dHR5IHVzZWxlc3MgaW4gdGhlIHdlYiBjb250ZW50IHByb2Nlc3MuCisgICAgICAgICogU3RvcHBl ZCB1c2luZyBOU0ZpbGVXcmFwcGVyIGZvciB0aGUgbWlzc2luZyBpbWFnZSBzbyB0aGUgYXR0YWNo bWVudCBjYW4gY29udGFpbiB0aGUKKyAgICAgICAgICByZXRpbmEgdmVyc2lvbnMgb2YgdGhlIG1p c3NpbmcgaW1hZ2UuCisgICAgICAgICogU2ltcGxpZmllZCBidW5kbGUgZmluZGluZyBjb2RlLCBz aW5jZSBXZWJDb3JlIGlzIGFzc3VtZWQgdG8gYmUgbG9hZGVkLgorCisgICAgICAgICogZWRpdGlu Zy9jb2NvYS9IVE1MQ29udmVydGVyLm1tOgorICAgICAgICAoSFRNTENvbnZlcnRlcjo6X2FkZEF0 dGFjaG1lbnRGb3JFbGVtZW50KTogVW5pZnkgYW5kIHNpbXBsaWZ5IG1pc3NpbmcgaW1hZ2UgcGF0 aC4KKyAgICAgICAgKF9OU0ZpcnN0UGF0aEZvckRpcmVjdG9yaWVzSW5Eb21haW5zKTogRGVsZXRl ZC4KKyAgICAgICAgKF9OU1N5c3RlbUxpYnJhcnlQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKF93 ZWJLaXRCdW5kbGUpOiBEZWxldGVkLgorCiAyMDE5LTA0LTAyICBGdWppaSBIaXJvbm9yaSAgPEhp cm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gV0VCS0lUX01BS0VfRk9S V0FSRElOR19IRUFERVJTIHNob3VsZG4ndCB1c2UgUE9TVF9CVUlMRCB0byBjb3B5IGdlbmVyYXRl ZCBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxD b252ZXJ0ZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxDb252ZXJ0ZXIu bW0KaW5kZXggZTk0ZDk3OGFiMDFmNTAzZjBiYTVjMWIyY2RjMjBhZGE0MWM1ZDkyNS4uMmNhZjgx MjA4MDJkZmVkZTNiNDI3OWI3NDRkYTUyNGE0NzJmMDU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbQpAQCAtOTgsNiArOTgsNyBAQCBTT0ZUX0xJ TktfQ0xBU1MoVUlGb3VuZGF0aW9uLCBOU1RleHRUYWIpCiAjZGVmaW5lIFBsYXRmb3JtTlNDb2xv ckNsYXNzICAgICAgICBnZXROU0NvbG9yQ2xhc3MoKQogI2RlZmluZSBQbGF0Zm9ybUZvbnQgICAg ICAgICAgICAgICAgVUlGb250CiAjZGVmaW5lIFBsYXRmb3JtRm9udENsYXNzICAgICAgICAgICBQ QUw6OmdldFVJRm9udENsYXNzKCkKKyNkZWZpbmUgUGxhdGZvcm1JbWFnZUNsYXNzICAgICAgICAg IFBBTDo6Z2V0VUlJbWFnZUNsYXNzKCkKIAogI2Vsc2UKIApAQCAtMTEzLDYgKzExNCw3IEBAIFNP RlRfTElOS19DTEFTUyhVSUZvdW5kYXRpb24sIE5TVGV4dFRhYikKICNkZWZpbmUgUGxhdGZvcm1O U0NvbG9yQ2xhc3MgICAgICAgIE5TQ29sb3IKICNkZWZpbmUgUGxhdGZvcm1Gb250ICAgICAgICAg ICAgICAgIE5TRm9udAogI2RlZmluZSBQbGF0Zm9ybUZvbnRDbGFzcyAgICAgICAgICAgTlNGb250 CisjZGVmaW5lIFBsYXRmb3JtSW1hZ2VDbGFzcyAgICAgICAgICBOU0ltYWdlCiAKICNlbmRpZgog CkBAIC03NzIsMjggKzc3NCw2IEBAIGJvb2wgSFRNTENvbnZlcnRlckNhY2hlczo6ZmxvYXRQcm9w ZXJ0eVZhbHVlRm9yTm9kZShOb2RlJiBub2RlLCBDU1NQcm9wZXJ0eUlEIHByCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLXN0YXRpYyBOU1N0cmluZyAq X05TRmlyc3RQYXRoRm9yRGlyZWN0b3JpZXNJbkRvbWFpbnMoTlNTZWFyY2hQYXRoRGlyZWN0b3J5 IGRpcmVjdG9yeSwgTlNTZWFyY2hQYXRoRG9tYWluTWFzayBkb21haW5NYXNrLCBCT09MIGV4cGFu ZFRpbGRlKQotewotICAgIE5TQXJyYXkgKmFycmF5ID0gTlNTZWFyY2hQYXRoRm9yRGlyZWN0b3Jp ZXNJbkRvbWFpbnMoZGlyZWN0b3J5LCBkb21haW5NYXNrLCBleHBhbmRUaWxkZSk7Ci0gICAgcmV0 dXJuIFthcnJheSBjb3VudF0gPj0gMSA/IFthcnJheSBvYmplY3RBdEluZGV4OjBdIDogbmlsOwot fQotCi1zdGF0aWMgTlNTdHJpbmcgKl9OU1N5c3RlbUxpYnJhcnlQYXRoKHZvaWQpCi17Ci0gICAg cmV0dXJuIF9OU0ZpcnN0UGF0aEZvckRpcmVjdG9yaWVzSW5Eb21haW5zKE5TTGlicmFyeURpcmVj dG9yeSwgTlNTeXN0ZW1Eb21haW5NYXNrLCBZRVMpOwotfQotCi1zdGF0aWMgTlNCdW5kbGUgKl93 ZWJLaXRCdW5kbGUoKQotewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSB1c2Ug dGhlIFdlYkNvcmUgYnVuZGxlIHRvIGF2b2lkIHRoZSBsYXllcmluZyB2aW9sYXRpb24uCi0gICAg TlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5h cHBsZS5XZWJLaXQiXTsKLSAgICBpZiAoIWJ1bmRsZSkKLSAgICAgICAgYnVuZGxlID0gW05TQnVu ZGxlIGJ1bmRsZVdpdGhQYXRoOltfTlNTeXN0ZW1MaWJyYXJ5UGF0aCgpIHN0cmluZ0J5QXBwZW5k aW5nUGF0aENvbXBvbmVudDpAIkZyYW1ld29ya3MvV2ViS2l0LmZyYW1ld29yayJdXTsKLSAgICBy ZXR1cm4gYnVuZGxlOwotfQotI2VuZGlmCi0KIHN0YXRpYyBpbmxpbmUgTlNTaGFkb3cgKl9zaGFk b3dGb3JTaGFkb3dTdHlsZShOU1N0cmluZyAqc2hhZG93U3R5bGUpCiB7CiAgICAgTlNTaGFkb3cg KnNoYWRvdyA9IG5pbDsKQEAgLTEzNTksMTkgKzEzMzksMTUgQEAgQk9PTCBIVE1MQ29udmVydGVy OjpfYWRkQXR0YWNobWVudEZvckVsZW1lbnQoRWxlbWVudCYgZWxlbWVudCwgTlNVUkwgKnVybCwg Qk9PTAogICAgICAgICAgICAgICAgIFthdHRhY2htZW50IHNldElnbm9yZXNPcmllbnRhdGlvbjpZ RVNdOwogI2VuZGlmCiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBOU0J1bmRsZSAqd2Vi Q29yZUJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5X ZWJDb3JlIl07CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgICAgIFthdHRhY2ht ZW50IHJlbGVhc2VdOwotICAgICAgICAgICAgTlNVUkwgKm1pc3NpbmdJbWFnZVVSTCA9IFtfd2Vi S2l0QnVuZGxlKCkgVVJMRm9yUmVzb3VyY2U6QCJtaXNzaW5nX2ltYWdlIiB3aXRoRXh0ZW5zaW9u OkAidGlmZiJdOwotICAgICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShtaXNzaW5nSW1hZ2VV UkwgIT0gbmlsLCAiVW5hYmxlIHRvIGZpbmQgbWlzc2luZ19pbWFnZS50aWZmISIpOwotICAgICAg ICAgICAgTlNGaWxlV3JhcHBlciAqbWlzc2luZ0ltYWdlRmlsZVdyYXBwZXIgPSBbW1tOU0ZpbGVX cmFwcGVyIGFsbG9jXSBpbml0V2l0aFVSTDptaXNzaW5nSW1hZ2VVUkwgb3B0aW9uczowIGVycm9y Ok5VTExdIGF1dG9yZWxlYXNlXTsKLSAgICAgICAgICAgIGF0dGFjaG1lbnQgPSBbW1BsYXRmb3Jt TlNUZXh0QXR0YWNobWVudCBhbGxvY10gaW5pdFdpdGhGaWxlV3JhcHBlcjptaXNzaW5nSW1hZ2VG aWxlV3JhcHBlcl07CisgICAgICAgICAgICBVSUltYWdlICptaXNzaW5nSW1hZ2UgPSBbUGxhdGZv cm1JbWFnZUNsYXNzIGltYWdlTmFtZWQ6QCJtaXNzaW5nSW1hZ2UiIGluQnVuZGxlOndlYkNvcmVC dW5kbGUgY29tcGF0aWJsZVdpdGhUcmFpdENvbGxlY3Rpb246bmlsXTsKICNlbHNlCi0gICAgICAg ICAgICBzdGF0aWMgTlNJbWFnZSAqbWlzc2luZ0ltYWdlID0gbmlsOwotICAgICAgICAgICAgTlNU ZXh0QXR0YWNobWVudENlbGwgKmNlbGw7Ci0gICAgICAgICAgICBjZWxsID0gW1tOU1RleHRBdHRh Y2htZW50Q2VsbCBhbGxvY10gaW5pdEltYWdlQ2VsbDptaXNzaW5nSW1hZ2VdOwotICAgICAgICAg ICAgW2F0dGFjaG1lbnQgc2V0QXR0YWNobWVudENlbGw6Y2VsbF07Ci0gICAgICAgICAgICBbY2Vs bCByZWxlYXNlXTsKKyAgICAgICAgICAgIE5TSW1hZ2UgKm1pc3NpbmdJbWFnZSA9IFt3ZWJDb3Jl QnVuZGxlIGltYWdlRm9yUmVzb3VyY2U6QCJtaXNzaW5nSW1hZ2UiXTsKICNlbmRpZgorICAgICAg ICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShtaXNzaW5nSW1hZ2UgIT0gbmlsLCAiVW5hYmxlIHRv IGZpbmQgbWlzc2luZ0ltYWdlLiIpOworICAgICAgICAgICAgYXR0YWNobWVudCA9IFtbUGxhdGZv cm1OU1RleHRBdHRhY2htZW50IGFsbG9jXSBpbml0V2l0aERhdGE6bmlsIG9mVHlwZTpuaWxdOwor ICAgICAgICAgICAgYXR0YWNobWVudC5nZXQoKS5pbWFnZSA9IG1pc3NpbmdJbWFnZTsKICAgICAg ICAgfQogICAgICAgICBbX2F0dHJTdHIgcmVwbGFjZUNoYXJhY3RlcnNJblJhbmdlOnJhbmdlVG9S ZXBsYWNlIHdpdGhTdHJpbmc6c3RyaW5nLmdldCgpXTsKICAgICAgICAgcmFuZ2VUb1JlcGxhY2Uu bGVuZ3RoID0gW3N0cmluZyBsZW5ndGhdOwo= 366522 2019-04-02 12:18:14 -0700 2019-04-02 14:06:55 -0700 Patch bug-196504-20190402121811.patch text/plain 5399 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZiMmM4ODZkZDQ5ODNj N2NlOWUyZjQxNTFhZWEyZjhiYmViZWY2My4uODQ4OTZiZGI4NDQyZGM0MTM1ODNiN2JlOThlMjcy NDM4YWMzNDZjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA0LTAyICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBOU0F0dHJpYnV0ZWRT dHJpbmcgY3Jhc2hlcyB3aGVuIGVuY29kaW5nIHRleHQgYXR0YWNobWVudCBjZWxsIGZvciBtaXNz aW5nIGltYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk2NTA0CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzQ5MTYxMjgxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYW4gdXAgYW5kIGZpeCBhIGNv dXBsZSBvZiBlcnJvcnMgYW5kIGNyYXNoZXMgaW4gdGhlIG1pc3NpbmcgaW1hZ2UgcGF0aCBvZiBv dXIKKyAgICAgICAgYXR0cmlidXRlZCBzdHJpbmcgY29udmVydGVyLgorCisgICAgICAgIEZpeGVz IGluY2x1ZGU6CisgICAgICAgICogUmVtb3ZlZCBtYW51YWwgY2FsbCB0byByZWxlYXNlIG9uIGEg UmV0YWluUHRyLCBsZWFkaW5nIHRvIGF1dG9yZWxlYXNlIHBvb2wgY3Jhc2guCisgICAgICAgICog Tm8gbG9uZ2VyIHRyeSB0byBsb2FkIGFuIGltYWdlIHRoYXQgaXMgbWlzc2luZyBvbiBkaXNrIGFu ZCBoYXMgbG9uZyBiZWVuIHJlbmFtZWQuCisgICAgICAgICogTm8gbG9uZ2VyIHVzZSBhIE5TVGV4 dEF0dGFjaG1lbnRDZWxsIGluIHRoZSBNYWMgY29kZSBwYXRoIHdoaWNoIGNhbid0IGJlIGVuY29k ZWQKKyAgICAgICAgICBmb3Igc2VuZGluZyB0byB0aGUgVUlQcm9jZXNzLCBzbyBpdCB3YXMgcHJl dHR5IHVzZWxlc3MgaW4gdGhlIHdlYiBjb250ZW50IHByb2Nlc3MuCisgICAgICAgICogU3RvcHBl ZCB1c2luZyBOU0ZpbGVXcmFwcGVyIGZvciB0aGUgbWlzc2luZyBpbWFnZSBzbyB0aGUgYXR0YWNo bWVudCBjYW4gY29udGFpbiB0aGUKKyAgICAgICAgICByZXRpbmEgdmVyc2lvbnMgb2YgdGhlIG1p c3NpbmcgaW1hZ2UuCisgICAgICAgICogU2ltcGxpZmllZCBidW5kbGUgZmluZGluZyBjb2RlLCBz aW5jZSBXZWJDb3JlIGlzIGFzc3VtZWQgdG8gYmUgbG9hZGVkLgorICAgICAgICAqIEZpeCBsZWFr IG9mIGF0dGFjaG1lbnQgYnkgYWRkaW5nIG1pc3NpbmcgYWRvcHROUygpLgorCisgICAgICAgICog ZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tOgorICAgICAgICAoSFRNTENvbnZlcnRlcjo6 X2FkZEF0dGFjaG1lbnRGb3JFbGVtZW50KTogVW5pZnkgYW5kIHNpbXBsaWZ5IG1pc3NpbmcgaW1h Z2UgcGF0aC4KKyAgICAgICAgKF9OU0ZpcnN0UGF0aEZvckRpcmVjdG9yaWVzSW5Eb21haW5zKTog RGVsZXRlZC4KKyAgICAgICAgKF9OU1N5c3RlbUxpYnJhcnlQYXRoKTogRGVsZXRlZC4KKyAgICAg ICAgKF93ZWJLaXRCdW5kbGUpOiBEZWxldGVkLgorCiAyMDE5LTA0LTAyICBGdWppaSBIaXJvbm9y aSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gV0VCS0lUX01B S0VfRk9SV0FSRElOR19IRUFERVJTIHNob3VsZG4ndCB1c2UgUE9TVF9CVUlMRCB0byBjb3B5IGdl bmVyYXRlZCBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29h L0hUTUxDb252ZXJ0ZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxDb252 ZXJ0ZXIubW0KaW5kZXggZTk0ZDk3OGFiMDFmNTAzZjBiYTVjMWIyY2RjMjBhZGE0MWM1ZDkyNS4u YjdhYjg5MGJmMjJhZGU4NWU2NDg4YThlZDlkY2FjZmUwNDgyYzViNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbQpAQCAtOTgsNiArOTgsNyBAQCBT T0ZUX0xJTktfQ0xBU1MoVUlGb3VuZGF0aW9uLCBOU1RleHRUYWIpCiAjZGVmaW5lIFBsYXRmb3Jt TlNDb2xvckNsYXNzICAgICAgICBnZXROU0NvbG9yQ2xhc3MoKQogI2RlZmluZSBQbGF0Zm9ybUZv bnQgICAgICAgICAgICAgICAgVUlGb250CiAjZGVmaW5lIFBsYXRmb3JtRm9udENsYXNzICAgICAg ICAgICBQQUw6OmdldFVJRm9udENsYXNzKCkKKyNkZWZpbmUgUGxhdGZvcm1JbWFnZUNsYXNzICAg ICAgICAgIFBBTDo6Z2V0VUlJbWFnZUNsYXNzKCkKIAogI2Vsc2UKIApAQCAtMTEzLDYgKzExNCw3 IEBAIFNPRlRfTElOS19DTEFTUyhVSUZvdW5kYXRpb24sIE5TVGV4dFRhYikKICNkZWZpbmUgUGxh dGZvcm1OU0NvbG9yQ2xhc3MgICAgICAgIE5TQ29sb3IKICNkZWZpbmUgUGxhdGZvcm1Gb250ICAg ICAgICAgICAgICAgIE5TRm9udAogI2RlZmluZSBQbGF0Zm9ybUZvbnRDbGFzcyAgICAgICAgICAg TlNGb250CisjZGVmaW5lIFBsYXRmb3JtSW1hZ2VDbGFzcyAgICAgICAgICBOU0ltYWdlCiAKICNl bmRpZgogCkBAIC03NzIsMjggKzc3NCw2IEBAIGJvb2wgSFRNTENvbnZlcnRlckNhY2hlczo6Zmxv YXRQcm9wZXJ0eVZhbHVlRm9yTm9kZShOb2RlJiBub2RlLCBDU1NQcm9wZXJ0eUlEIHByCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLXN0YXRpYyBOU1N0 cmluZyAqX05TRmlyc3RQYXRoRm9yRGlyZWN0b3JpZXNJbkRvbWFpbnMoTlNTZWFyY2hQYXRoRGly ZWN0b3J5IGRpcmVjdG9yeSwgTlNTZWFyY2hQYXRoRG9tYWluTWFzayBkb21haW5NYXNrLCBCT09M IGV4cGFuZFRpbGRlKQotewotICAgIE5TQXJyYXkgKmFycmF5ID0gTlNTZWFyY2hQYXRoRm9yRGly ZWN0b3JpZXNJbkRvbWFpbnMoZGlyZWN0b3J5LCBkb21haW5NYXNrLCBleHBhbmRUaWxkZSk7Ci0g ICAgcmV0dXJuIFthcnJheSBjb3VudF0gPj0gMSA/IFthcnJheSBvYmplY3RBdEluZGV4OjBdIDog bmlsOwotfQotCi1zdGF0aWMgTlNTdHJpbmcgKl9OU1N5c3RlbUxpYnJhcnlQYXRoKHZvaWQpCi17 Ci0gICAgcmV0dXJuIF9OU0ZpcnN0UGF0aEZvckRpcmVjdG9yaWVzSW5Eb21haW5zKE5TTGlicmFy eURpcmVjdG9yeSwgTlNTeXN0ZW1Eb21haW5NYXNrLCBZRVMpOwotfQotCi1zdGF0aWMgTlNCdW5k bGUgKl93ZWJLaXRCdW5kbGUoKQotewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJs eSB1c2UgdGhlIFdlYkNvcmUgYnVuZGxlIHRvIGF2b2lkIHRoZSBsYXllcmluZyB2aW9sYXRpb24u Ci0gICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpA ImNvbS5hcHBsZS5XZWJLaXQiXTsKLSAgICBpZiAoIWJ1bmRsZSkKLSAgICAgICAgYnVuZGxlID0g W05TQnVuZGxlIGJ1bmRsZVdpdGhQYXRoOltfTlNTeXN0ZW1MaWJyYXJ5UGF0aCgpIHN0cmluZ0J5 QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkZyYW1ld29ya3MvV2ViS2l0LmZyYW1ld29yayJdXTsK LSAgICByZXR1cm4gYnVuZGxlOwotfQotI2VuZGlmCi0KIHN0YXRpYyBpbmxpbmUgTlNTaGFkb3cg Kl9zaGFkb3dGb3JTaGFkb3dTdHlsZShOU1N0cmluZyAqc2hhZG93U3R5bGUpCiB7CiAgICAgTlNT aGFkb3cgKnNoYWRvdyA9IG5pbDsKQEAgLTEzNTksMTkgKzEzMzksMTUgQEAgQk9PTCBIVE1MQ29u dmVydGVyOjpfYWRkQXR0YWNobWVudEZvckVsZW1lbnQoRWxlbWVudCYgZWxlbWVudCwgTlNVUkwg KnVybCwgQk9PTAogICAgICAgICAgICAgICAgIFthdHRhY2htZW50IHNldElnbm9yZXNPcmllbnRh dGlvbjpZRVNdOwogI2VuZGlmCiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBOU0J1bmRs ZSAqd2ViQ29yZUJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5h cHBsZS5XZWJDb3JlIl07CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgICAgIFth dHRhY2htZW50IHJlbGVhc2VdOwotICAgICAgICAgICAgTlNVUkwgKm1pc3NpbmdJbWFnZVVSTCA9 IFtfd2ViS2l0QnVuZGxlKCkgVVJMRm9yUmVzb3VyY2U6QCJtaXNzaW5nX2ltYWdlIiB3aXRoRXh0 ZW5zaW9uOkAidGlmZiJdOwotICAgICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShtaXNzaW5n SW1hZ2VVUkwgIT0gbmlsLCAiVW5hYmxlIHRvIGZpbmQgbWlzc2luZ19pbWFnZS50aWZmISIpOwot ICAgICAgICAgICAgTlNGaWxlV3JhcHBlciAqbWlzc2luZ0ltYWdlRmlsZVdyYXBwZXIgPSBbW1tO U0ZpbGVXcmFwcGVyIGFsbG9jXSBpbml0V2l0aFVSTDptaXNzaW5nSW1hZ2VVUkwgb3B0aW9uczow IGVycm9yOk5VTExdIGF1dG9yZWxlYXNlXTsKLSAgICAgICAgICAgIGF0dGFjaG1lbnQgPSBbW1Bs YXRmb3JtTlNUZXh0QXR0YWNobWVudCBhbGxvY10gaW5pdFdpdGhGaWxlV3JhcHBlcjptaXNzaW5n SW1hZ2VGaWxlV3JhcHBlcl07CisgICAgICAgICAgICBVSUltYWdlICptaXNzaW5nSW1hZ2UgPSBb UGxhdGZvcm1JbWFnZUNsYXNzIGltYWdlTmFtZWQ6QCJtaXNzaW5nSW1hZ2UiIGluQnVuZGxlOndl YkNvcmVCdW5kbGUgY29tcGF0aWJsZVdpdGhUcmFpdENvbGxlY3Rpb246bmlsXTsKICNlbHNlCi0g ICAgICAgICAgICBzdGF0aWMgTlNJbWFnZSAqbWlzc2luZ0ltYWdlID0gbmlsOwotICAgICAgICAg ICAgTlNUZXh0QXR0YWNobWVudENlbGwgKmNlbGw7Ci0gICAgICAgICAgICBjZWxsID0gW1tOU1Rl eHRBdHRhY2htZW50Q2VsbCBhbGxvY10gaW5pdEltYWdlQ2VsbDptaXNzaW5nSW1hZ2VdOwotICAg ICAgICAgICAgW2F0dGFjaG1lbnQgc2V0QXR0YWNobWVudENlbGw6Y2VsbF07Ci0gICAgICAgICAg ICBbY2VsbCByZWxlYXNlXTsKKyAgICAgICAgICAgIE5TSW1hZ2UgKm1pc3NpbmdJbWFnZSA9IFt3 ZWJDb3JlQnVuZGxlIGltYWdlRm9yUmVzb3VyY2U6QCJtaXNzaW5nSW1hZ2UiXTsKICNlbmRpZgor ICAgICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShtaXNzaW5nSW1hZ2UgIT0gbmlsLCAiVW5h YmxlIHRvIGZpbmQgbWlzc2luZ0ltYWdlLiIpOworICAgICAgICAgICAgYXR0YWNobWVudCA9IGFk b3B0TlMoW1tQbGF0Zm9ybU5TVGV4dEF0dGFjaG1lbnQgYWxsb2NdIGluaXRXaXRoRGF0YTpuaWwg b2ZUeXBlOm5pbF0pOworICAgICAgICAgICAgYXR0YWNobWVudC5nZXQoKS5pbWFnZSA9IG1pc3Np bmdJbWFnZTsKICAgICAgICAgfQogICAgICAgICBbX2F0dHJTdHIgcmVwbGFjZUNoYXJhY3RlcnNJ blJhbmdlOnJhbmdlVG9SZXBsYWNlIHdpdGhTdHJpbmc6c3RyaW5nLmdldCgpXTsKICAgICAgICAg cmFuZ2VUb1JlcGxhY2UubGVuZ3RoID0gW3N0cmluZyBsZW5ndGhdOwo=