181104 2017-12-21 14:15:09 -0800 Minor cleanup in WebContentReaderCocoa after r226213 2017-12-21 14:36:07 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1384260 0 rniwa 2017-12-21 14:15:09 -0800 Use more early exit to make the logic clear. 1384261 1 330067 rniwa 2017-12-21 14:17:12 -0800 Created attachment 330067 Cleanup 1384265 2 330067 wenson_hsieh 2017-12-21 14:22:48 -0800 Comment on attachment 330067 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=330067&action=review > Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm:345 > +static String markupForFragmentToInDocument(Ref<DocumentFragment>&& fragment, Document& document) Did you mean markupForFragmentInDocument? 1384266 3 rniwa 2017-12-21 14:23:34 -0800 (In reply to Wenson Hsieh from comment #2) > Comment on attachment 330067 [details] > Cleanup > > View in context: > https://bugs.webkit.org/attachment.cgi?id=330067&action=review > > > Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm:345 > > +static String markupForFragmentToInDocument(Ref<DocumentFragment>&& fragment, Document& document) > > Did you mean markupForFragmentInDocument? Oops, yes. Will fix. 1384270 4 rniwa 2017-12-21 14:32:16 -0800 Committed r226242: <https://trac.webkit.org/changeset/226242> 1384271 5 webkit-bug-importer 2017-12-21 14:36:07 -0800 <rdar://problem/36185686> 330067 2017-12-21 14:17:12 -0800 2017-12-21 14:22:48 -0800 Cleanup bug-181104-20171221141712.patch text/plain 8426 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjI0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEyLTIxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1pbm9yIGNsZWFudXAgaW4gV2Vi Q29udGVudFJlYWRlckNvY29hIGFmdGVyIHIyMjYyMTMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTEwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERlcGxveWVkIGVhcmx5IGV4aXN0cyBpbiB0aGUgY2Fz ZSBvZiBhdHRhY2htZW50IHJlcGxhY2VtZW50cyB0byBtYWtlIHRoZSBjb2RlIGVhc2llciB0byBy ZWFkLgorCisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW06 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVGcmFnbWVudEFuZEFkZFJlc291cmNlcyk6CisgICAg ICAgIChXZWJDb3JlOjptYXJrdXBGb3JGcmFnbWVudFRvSW5Eb2N1bWVudCk6IEV4dHJhY3RlZCBv dXQgb2Ygc2FuaXRpemVNYXJrdXBXaXRoQXJjaGl2ZS4KKyAgICAgICAgKFdlYkNvcmU6OnNhbml0 aXplTWFya3VwV2l0aEFyY2hpdmUpOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29udGVudFJlYWRl cjo6cmVhZEltYWdlKTogU2ltcGxpZmllZCB0aGUgcmV0dXJuIGxvZ2ljLgorCiAyMDE3LTEyLTIx ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1JlbmRlclRyZWVC dWlsZGVyXSBNb3ZlIFJlbmRlclJ1YnlBc0Jsb2NrOjphZGRDaGlsZCBtdXRhdGlvbiB0byBhIFJl bmRlclRyZWVCdWlsZGVyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dlYkNv bnRlbnRSZWFkZXJDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQkocmV2aXNpb24gMjI2MjM2KQorKysgU291 cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW0JKHdvcmtp bmcgY29weSkKQEAgLTMwMywxOSArMzAzLDE5IEBAIFJlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBj cmVhdGVGcmFnbWVudEEKICAgICAgICAgcmV0dXJuIFdURk1vdmUoZnJhZ21lbnRBbmRSZXNvdXJj ZXMuZnJhZ21lbnQpOwogICAgIH0KIAotICAgIGlmIChzaG91bGRSZXBsYWNlUmljaENvbnRlbnRX aXRoQXR0YWNobWVudHMoKSkKKyAgICBpZiAoc2hvdWxkUmVwbGFjZVJpY2hDb250ZW50V2l0aEF0 dGFjaG1lbnRzKCkpIHsKICAgICAgICAgcmVwbGFjZVJpY2hDb250ZW50V2l0aEF0dGFjaG1lbnRz KCpmcmFnbWVudEFuZFJlc291cmNlcy5mcmFnbWVudCwgZnJhZ21lbnRBbmRSZXNvdXJjZXMucmVz b3VyY2VzKTsKLSAgICBlbHNlIHsKLSAgICAgICAgSGFzaE1hcDxBdG9taWNTdHJpbmcsIEF0b21p Y1N0cmluZz4gYmxvYlVSTE1hcDsKLSAgICAgICAgZm9yIChjb25zdCBSZWY8QXJjaGl2ZVJlc291 cmNlPiYgc3VicmVzb3VyY2UgOiBmcmFnbWVudEFuZFJlc291cmNlcy5yZXNvdXJjZXMpIHsKLSAg ICAgICAgICAgIGF1dG8gYmxvYiA9IEJsb2I6OmNyZWF0ZShzdWJyZXNvdXJjZS0+ZGF0YSgpLCBz dWJyZXNvdXJjZS0+bWltZVR5cGUoKSk7Ci0gICAgICAgICAgICBTdHJpbmcgYmxvYlVSTCA9IERP TVVSTDo6Y3JlYXRlT2JqZWN0VVJMKGRvY3VtZW50LCBibG9iKTsKLSAgICAgICAgICAgIGJsb2JV UkxNYXAuc2V0KHN1YnJlc291cmNlLT51cmwoKS5zdHJpbmcoKSwgYmxvYlVSTCk7Ci0gICAgICAg IH0KKyAgICAgICAgcmV0dXJuIFdURk1vdmUoZnJhZ21lbnRBbmRSZXNvdXJjZXMuZnJhZ21lbnQp OworICAgIH0KIAotICAgICAgICByZXBsYWNlU3VicmVzb3VyY2VVUkxzKCpmcmFnbWVudEFuZFJl c291cmNlcy5mcmFnbWVudCwgV1RGTW92ZShibG9iVVJMTWFwKSk7CisgICAgSGFzaE1hcDxBdG9t aWNTdHJpbmcsIEF0b21pY1N0cmluZz4gYmxvYlVSTE1hcDsKKyAgICBmb3IgKGNvbnN0IFJlZjxB cmNoaXZlUmVzb3VyY2U+JiBzdWJyZXNvdXJjZSA6IGZyYWdtZW50QW5kUmVzb3VyY2VzLnJlc291 cmNlcykgeworICAgICAgICBhdXRvIGJsb2IgPSBCbG9iOjpjcmVhdGUoc3VicmVzb3VyY2UtPmRh dGEoKSwgc3VicmVzb3VyY2UtPm1pbWVUeXBlKCkpOworICAgICAgICBTdHJpbmcgYmxvYlVSTCA9 IERPTVVSTDo6Y3JlYXRlT2JqZWN0VVJMKGRvY3VtZW50LCBibG9iKTsKKyAgICAgICAgYmxvYlVS TE1hcC5zZXQoc3VicmVzb3VyY2UtPnVybCgpLnN0cmluZygpLCBibG9iVVJMKTsKICAgICB9CiAK KyAgICByZXBsYWNlU3VicmVzb3VyY2VVUkxzKCpmcmFnbWVudEFuZFJlc291cmNlcy5mcmFnbWVu dCwgV1RGTW92ZShibG9iVVJMTWFwKSk7CiAgICAgcmV0dXJuIFdURk1vdmUoZnJhZ21lbnRBbmRS ZXNvdXJjZXMuZnJhZ21lbnQpOwogfQogCkBAIC0zNDIsNiArMzQyLDE3IEBAIHN0YXRpYyBzdGQ6 Om9wdGlvbmFsPE1hcmt1cEFuZEFyY2hpdmU+IGUKICAgICByZXR1cm4gTWFya3VwQW5kQXJjaGl2 ZSB7IFN0cmluZzo6ZnJvbVVURjgobWFpblJlc291cmNlLT5kYXRhKCkuZGF0YSgpLCBtYWluUmVz b3VyY2UtPmRhdGEoKS5zaXplKCkpLCBtYWluUmVzb3VyY2UucmVsZWFzZU5vbk51bGwoKSwgYXJj aGl2ZS5yZWxlYXNlTm9uTnVsbCgpIH07CiB9CiAKK3N0YXRpYyBTdHJpbmcgbWFya3VwRm9yRnJh Z21lbnRUb0luRG9jdW1lbnQoUmVmPERvY3VtZW50RnJhZ21lbnQ+JiYgZnJhZ21lbnQsIERvY3Vt ZW50JiBkb2N1bWVudCkKK3sKKyAgICBhdXRvKiBib2R5RWxlbWVudCA9IGRvY3VtZW50LmJvZHko KTsKKyAgICBBU1NFUlQoYm9keUVsZW1lbnQpOworICAgIGJvZHlFbGVtZW50LT5hcHBlbmRDaGls ZChXVEZNb3ZlKGZyYWdtZW50KSk7CisKKyAgICBhdXRvIHJhbmdlID0gUmFuZ2U6OmNyZWF0ZShk b2N1bWVudCk7CisgICAgcmFuZ2UtPnNlbGVjdE5vZGVDb250ZW50cygqYm9keUVsZW1lbnQpOwor ICAgIHJldHVybiBjcmVhdGVNYXJrdXAocmFuZ2UuZ2V0KCksIG51bGxwdHIsIEFubm90YXRlRm9y SW50ZXJjaGFuZ2UsIGZhbHNlLCBSZXNvbHZlTm9uTG9jYWxVUkxzKTsKK30KKwogc3RhdGljIFN0 cmluZyBzYW5pdGl6ZU1hcmt1cFdpdGhBcmNoaXZlKERvY3VtZW50JiBkZXN0aW5hdGlvbkRvY3Vt ZW50LCBNYXJrdXBBbmRBcmNoaXZlJiBtYXJrdXBBbmRBcmNoaXZlLCBjb25zdCBzdGQ6OmZ1bmN0 aW9uPGJvb2woY29uc3QgU3RyaW5nKT4mIGNhblNob3dNSU1FVHlwZUFzSFRNTCkKIHsKICAgICBh dXRvIHBhZ2UgPSBjcmVhdGVQYWdlRm9yU2FuaXRpemluZ1dlYkNvbnRlbnQoKTsKQEAgLTM0OSw1 MSArMzYwLDQ2IEBAIHN0YXRpYyBTdHJpbmcgc2FuaXRpemVNYXJrdXBXaXRoQXJjaGl2ZSgKICAg ICBBU1NFUlQoc3RhZ2luZ0RvY3VtZW50KTsKICAgICBhdXRvIGZyYWdtZW50ID0gY3JlYXRlRnJh Z21lbnRGcm9tTWFya3VwKCpzdGFnaW5nRG9jdW1lbnQsIG1hcmt1cEFuZEFyY2hpdmUubWFya3Vw LCBtYXJrdXBBbmRBcmNoaXZlLm1haW5SZXNvdXJjZS0+dXJsKCksIERpc2FsbG93U2NyaXB0aW5n QW5kUGx1Z2luQ29udGVudCk7CiAKLSAgICBpZiAoc2hvdWxkUmVwbGFjZVJpY2hDb250ZW50V2l0 aEF0dGFjaG1lbnRzKCkpCisgICAgaWYgKHNob3VsZFJlcGxhY2VSaWNoQ29udGVudFdpdGhBdHRh Y2htZW50cygpKSB7CiAgICAgICAgIHJlcGxhY2VSaWNoQ29udGVudFdpdGhBdHRhY2htZW50cyhm cmFnbWVudCwgbWFya3VwQW5kQXJjaGl2ZS5hcmNoaXZlLT5zdWJyZXNvdXJjZXMoKSk7Ci0gICAg ZWxzZSB7Ci0gICAgICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBBdG9taWNTdHJpbmc+IGJsb2JV UkxNYXA7Ci0gICAgICAgIGZvciAoY29uc3QgUmVmPEFyY2hpdmVSZXNvdXJjZT4mIHN1YnJlc291 cmNlIDogbWFya3VwQW5kQXJjaGl2ZS5hcmNoaXZlLT5zdWJyZXNvdXJjZXMoKSkgewotICAgICAg ICAgICAgYXV0byBibG9iID0gQmxvYjo6Y3JlYXRlKHN1YnJlc291cmNlLT5kYXRhKCksIHN1YnJl c291cmNlLT5taW1lVHlwZSgpKTsKLSAgICAgICAgICAgIFN0cmluZyBibG9iVVJMID0gRE9NVVJM OjpjcmVhdGVPYmplY3RVUkwoZGVzdGluYXRpb25Eb2N1bWVudCwgYmxvYik7Ci0gICAgICAgICAg ICBibG9iVVJMTWFwLnNldChzdWJyZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCksIGJsb2JVUkwpOwot ICAgICAgICB9Ci0KLSAgICAgICAgYXV0byBjb250ZW50T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46 OmNyZWF0ZShtYXJrdXBBbmRBcmNoaXZlLm1haW5SZXNvdXJjZS0+dXJsKCkpOwotICAgICAgICBm b3IgKGNvbnN0IFJlZjxBcmNoaXZlPiYgc3ViZnJhbWVBcmNoaXZlIDogbWFya3VwQW5kQXJjaGl2 ZS5hcmNoaXZlLT5zdWJmcmFtZUFyY2hpdmVzKCkpIHsKLSAgICAgICAgICAgIFJlZlB0cjxBcmNo aXZlUmVzb3VyY2U+IHN1YmZyYW1lTWFpblJlc291cmNlID0gc3ViZnJhbWVBcmNoaXZlLT5tYWlu UmVzb3VyY2UoKTsKLSAgICAgICAgICAgIGlmICghc3ViZnJhbWVNYWluUmVzb3VyY2UpCi0gICAg ICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAgIGF1dG8gdHlwZSA9IHN1YmZyYW1l TWFpblJlc291cmNlLT5taW1lVHlwZSgpOwotICAgICAgICAgICAgaWYgKCFjYW5TaG93TUlNRVR5 cGVBc0hUTUwodHlwZSkpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAg IGF1dG8gc3ViZnJhbWVVUkwgPSBzdWJmcmFtZU1haW5SZXNvdXJjZS0+dXJsKCk7Ci0gICAgICAg ICAgICBNYXJrdXBBbmRBcmNoaXZlIHN1YmZyYW1lQ29udGVudCA9IHsgU3RyaW5nOjpmcm9tVVRG OChzdWJmcmFtZU1haW5SZXNvdXJjZS0+ZGF0YSgpLmRhdGEoKSwgc3ViZnJhbWVNYWluUmVzb3Vy Y2UtPmRhdGEoKS5zaXplKCkpLAotICAgICAgICAgICAgICAgIHN1YmZyYW1lTWFpblJlc291cmNl LnJlbGVhc2VOb25OdWxsKCksIHN1YmZyYW1lQXJjaGl2ZS5jb3B5UmVmKCkgfTsKLSAgICAgICAg ICAgIGF1dG8gc3ViZnJhbWVNYXJrdXAgPSBzYW5pdGl6ZU1hcmt1cFdpdGhBcmNoaXZlKGRlc3Rp bmF0aW9uRG9jdW1lbnQsIHN1YmZyYW1lQ29udGVudCwgY2FuU2hvd01JTUVUeXBlQXNIVE1MKTsK LQotICAgICAgICAgICAgQ1N0cmluZyB1dGY4ID0gc3ViZnJhbWVNYXJrdXAudXRmOCgpOwotICAg ICAgICAgICAgVmVjdG9yPHVpbnQ4X3Q+IGJsb2JCdWZmZXI7Ci0gICAgICAgICAgICBibG9iQnVm ZmVyLnJlc2VydmVDYXBhY2l0eSh1dGY4Lmxlbmd0aCgpKTsKLSAgICAgICAgICAgIGJsb2JCdWZm ZXIuYXBwZW5kKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHV0ZjguZGF0YSgpKSwg dXRmOC5sZW5ndGgoKSk7Ci0gICAgICAgICAgICBhdXRvIGJsb2IgPSBCbG9iOjpjcmVhdGUoV1RG TW92ZShibG9iQnVmZmVyKSwgdHlwZSk7Ci0KLSAgICAgICAgICAgIFN0cmluZyBzdWJmcmFtZUJs b2JVUkwgPSBET01VUkw6OmNyZWF0ZU9iamVjdFVSTChkZXN0aW5hdGlvbkRvY3VtZW50LCBibG9i KTsKLSAgICAgICAgICAgIGJsb2JVUkxNYXAuc2V0KHN1YmZyYW1lVVJMLnN0cmluZygpLCBzdWJm cmFtZUJsb2JVUkwpOwotICAgICAgICB9CisgICAgICAgIHJldHVybiBtYXJrdXBGb3JGcmFnbWVu dFRvSW5Eb2N1bWVudChXVEZNb3ZlKGZyYWdtZW50KSwgKnN0YWdpbmdEb2N1bWVudCk7CisgICAg fQogCi0gICAgICAgIHJlcGxhY2VTdWJyZXNvdXJjZVVSTHMoZnJhZ21lbnQuZ2V0KCksIFdURk1v dmUoYmxvYlVSTE1hcCkpOworICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBBdG9taWNTdHJpbmc+ IGJsb2JVUkxNYXA7CisgICAgZm9yIChjb25zdCBSZWY8QXJjaGl2ZVJlc291cmNlPiYgc3VicmVz b3VyY2UgOiBtYXJrdXBBbmRBcmNoaXZlLmFyY2hpdmUtPnN1YnJlc291cmNlcygpKSB7CisgICAg ICAgIGF1dG8gYmxvYiA9IEJsb2I6OmNyZWF0ZShzdWJyZXNvdXJjZS0+ZGF0YSgpLCBzdWJyZXNv dXJjZS0+bWltZVR5cGUoKSk7CisgICAgICAgIFN0cmluZyBibG9iVVJMID0gRE9NVVJMOjpjcmVh dGVPYmplY3RVUkwoZGVzdGluYXRpb25Eb2N1bWVudCwgYmxvYik7CisgICAgICAgIGJsb2JVUkxN YXAuc2V0KHN1YnJlc291cmNlLT51cmwoKS5zdHJpbmcoKSwgYmxvYlVSTCk7CiAgICAgfQogCi0g ICAgYXV0byogYm9keUVsZW1lbnQgPSBzdGFnaW5nRG9jdW1lbnQtPmJvZHkoKTsKLSAgICBBU1NF UlQoYm9keUVsZW1lbnQpOwotICAgIGJvZHlFbGVtZW50LT5hcHBlbmRDaGlsZChmcmFnbWVudCk7 CisgICAgYXV0byBjb250ZW50T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShtYXJrdXBB bmRBcmNoaXZlLm1haW5SZXNvdXJjZS0+dXJsKCkpOworICAgIGZvciAoY29uc3QgUmVmPEFyY2hp dmU+JiBzdWJmcmFtZUFyY2hpdmUgOiBtYXJrdXBBbmRBcmNoaXZlLmFyY2hpdmUtPnN1YmZyYW1l QXJjaGl2ZXMoKSkgeworICAgICAgICBSZWZQdHI8QXJjaGl2ZVJlc291cmNlPiBzdWJmcmFtZU1h aW5SZXNvdXJjZSA9IHN1YmZyYW1lQXJjaGl2ZS0+bWFpblJlc291cmNlKCk7CisgICAgICAgIGlm ICghc3ViZnJhbWVNYWluUmVzb3VyY2UpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAg ICBhdXRvIHR5cGUgPSBzdWJmcmFtZU1haW5SZXNvdXJjZS0+bWltZVR5cGUoKTsKKyAgICAgICAg aWYgKCFjYW5TaG93TUlNRVR5cGVBc0hUTUwodHlwZSkpCisgICAgICAgICAgICBjb250aW51ZTsK KworICAgICAgICBhdXRvIHN1YmZyYW1lVVJMID0gc3ViZnJhbWVNYWluUmVzb3VyY2UtPnVybCgp OworICAgICAgICBNYXJrdXBBbmRBcmNoaXZlIHN1YmZyYW1lQ29udGVudCA9IHsgU3RyaW5nOjpm cm9tVVRGOChzdWJmcmFtZU1haW5SZXNvdXJjZS0+ZGF0YSgpLmRhdGEoKSwgc3ViZnJhbWVNYWlu UmVzb3VyY2UtPmRhdGEoKS5zaXplKCkpLAorICAgICAgICAgICAgc3ViZnJhbWVNYWluUmVzb3Vy Y2UucmVsZWFzZU5vbk51bGwoKSwgc3ViZnJhbWVBcmNoaXZlLmNvcHlSZWYoKSB9OworICAgICAg ICBhdXRvIHN1YmZyYW1lTWFya3VwID0gc2FuaXRpemVNYXJrdXBXaXRoQXJjaGl2ZShkZXN0aW5h dGlvbkRvY3VtZW50LCBzdWJmcmFtZUNvbnRlbnQsIGNhblNob3dNSU1FVHlwZUFzSFRNTCk7CisK KyAgICAgICAgQ1N0cmluZyB1dGY4ID0gc3ViZnJhbWVNYXJrdXAudXRmOCgpOworICAgICAgICBW ZWN0b3I8dWludDhfdD4gYmxvYkJ1ZmZlcjsKKyAgICAgICAgYmxvYkJ1ZmZlci5yZXNlcnZlQ2Fw YWNpdHkodXRmOC5sZW5ndGgoKSk7CisgICAgICAgIGJsb2JCdWZmZXIuYXBwZW5kKHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHV0ZjguZGF0YSgpKSwgdXRmOC5sZW5ndGgoKSk7Cisg ICAgICAgIGF1dG8gYmxvYiA9IEJsb2I6OmNyZWF0ZShXVEZNb3ZlKGJsb2JCdWZmZXIpLCB0eXBl KTsKIAotICAgIGF1dG8gcmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKCpzdGFnaW5nRG9jdW1lbnQpOwot ICAgIHJhbmdlLT5zZWxlY3ROb2RlQ29udGVudHMoKmJvZHlFbGVtZW50KTsKLSAgICByZXR1cm4g Y3JlYXRlTWFya3VwKHJhbmdlLmdldCgpLCBudWxscHRyLCBBbm5vdGF0ZUZvckludGVyY2hhbmdl LCBmYWxzZSwgUmVzb2x2ZU5vbkxvY2FsVVJMcyk7CisgICAgICAgIFN0cmluZyBzdWJmcmFtZUJs b2JVUkwgPSBET01VUkw6OmNyZWF0ZU9iamVjdFVSTChkZXN0aW5hdGlvbkRvY3VtZW50LCBibG9i KTsKKyAgICAgICAgYmxvYlVSTE1hcC5zZXQoc3ViZnJhbWVVUkwuc3RyaW5nKCksIHN1YmZyYW1l QmxvYlVSTCk7CisgICAgfQorCisgICAgcmVwbGFjZVN1YnJlc291cmNlVVJMcyhmcmFnbWVudC5n ZXQoKSwgV1RGTW92ZShibG9iVVJMTWFwKSk7CisKKyAgICByZXR1cm4gbWFya3VwRm9yRnJhZ21l bnRUb0luRG9jdW1lbnQoV1RGTW92ZShmcmFnbWVudCksICpzdGFnaW5nRG9jdW1lbnQpOwogfQog CiBib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRXZWJBcmNoaXZlKFNoYXJlZEJ1ZmZlciYgYnVm ZmVyKQpAQCAtNTcyLDEwICs1NzgsNyBAQCBib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRJbWFn ZShSZWY8U2hhCiAgICAgZWxzZQogICAgICAgICBhZGRGcmFnbWVudChjcmVhdGVGcmFnbWVudEZv ckltYWdlQW5kVVJMKGRvY3VtZW50LCBET01VUkw6OmNyZWF0ZU9iamVjdFVSTChkb2N1bWVudCwg YmxvYikpKTsKIAotICAgIGlmICghZnJhZ21lbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQot ICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBmcmFnbWVudDsKIH0KIAogfQo=