71539 2011-11-03 22:19:48 -0700 [Mac] ResourceRequest's nsURLRequest() does not differentiate null and empty URLs with CFNetwork 2011-11-07 09:08:42 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin ddkilzer kling menard ossy psolanki webkit.review.bot oldest_to_newest 496046 0 benjamin 2011-11-03 22:19:48 -0700 CFURL C API does not handle empty string. Creating a CFURL with an empty CFString gives you a NULL CFURLRef. WebKit's KURL and NSURL make the distinction between null and empty URL. When using CFNetwork internally and the Foundation classes for the API, this gives us inconsistency with OS X and crashes when accessing the null URL. We shall support empty URL when we use both CFURL and NSURL and convert between the two in the network layer. 496050 1 113622 benjamin 2011-11-03 22:25:03 -0700 Created attachment 113622 Patch 496051 2 benjamin 2011-11-03 22:26:53 -0700 The next step is to get rid of copyToBuffer() (we are the only one using that) and fix the warning. I did not do that here to not fix two bugs in one patch. 496274 3 113622 ddkilzer 2011-11-04 10:34:49 -0700 Comment on attachment 113622 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113622&action=review r=me, but setting the r- flag since you wanted this to go through the commit queue. (Also, it seems the win EWS bot is building for Mac OS X?!) > Source/WebCore/platform/cf/KURLCFNet.cpp:82 > + CharBuffer buffer; I don't think you can use CharBuffer here, can you? It only seems to be typedef-ed in KURL.cpp. Might be useful to move that typedef to KURL.h in another patch, though. > Source/WebCore/platform/mac/KURLMac.mm:75 > + return (CFURLRef)[[NSURL alloc] initWithString:@""]; Can you use reinterpret_cast<CFURLRef>() instead of a C-style cast here? 496456 4 ddkilzer 2011-11-04 14:09:20 -0700 <rdar://problem/10041448> 496480 5 113717 benjamin 2011-11-04 14:38:08 -0700 Created attachment 113717 Patch 496481 6 benjamin 2011-11-04 14:40:10 -0700 > > Source/WebCore/platform/cf/KURLCFNet.cpp:82 > > + CharBuffer buffer; > > I don't think you can use CharBuffer here, can you? It only seems to be typedef-ed in KURL.cpp. Yep, good catch. > Might be useful to move that typedef to KURL.h in another patch, though. I would prefer not to spread the CharBuffer typedef. I am trying to fix the 2 FIXME in a follow up and that should get rid of the CharBuffer in the Mac specific files. 496535 7 113717 ddkilzer 2011-11-04 16:22:24 -0700 Comment on attachment 113717 Patch r=me! 496538 8 113717 psolanki 2011-11-04 16:24:04 -0700 Comment on attachment 113717 Patch Patch looks good to me as well. 496564 9 113717 webkit.review.bot 2011-11-04 17:03:01 -0700 Comment on attachment 113717 Patch Clearing flags on attachment: 113717 Committed r99334: <http://trac.webkit.org/changeset/99334> 496565 10 webkit.review.bot 2011-11-04 17:03:06 -0700 All reviewed patches have been landed. Closing bug. 496894 11 113717 ossy 2011-11-06 14:53:59 -0800 Comment on attachment 113717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113717&action=review It broke QtWebKit on Mac: ld: duplicate symbol WebCore::KURL::createCFURL() constin /buildbot/snowleopard-qt-release/snowleopard-qt-intel-release/build/WebKitBuild/Release/Source/WebCore/release/libwebcore.a(KURLCFNet.o) and /buildbot/snowleopard-qt-release/snowleopard-qt-intel-release/build/WebKitBuild/Release/Source/WebCore/release/libwebcore.a(KURLMac.o) > Source/WebCore/platform/cf/KURLCFNet.cpp:79 > +#if !PLATFORM(MAC) > +CFURLRef KURL::createCFURL() const It is true if you build QtWebKit on Mac. > Source/WebCore/platform/mac/KURLMac.mm:70 > +CFURLRef KURL::createCFURL() const . 496897 12 benjamin 2011-11-06 15:08:39 -0800 (In reply to comment #11) > (From update of attachment 113717 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=113717&action=review > > It broke QtWebKit on Mac: Do you need this file on QtWebKit? It is to convert KURL to/from CFURL. Maybe this was added by accident? 497201 13 ossy 2011-11-07 08:43:16 -0800 (In reply to comment #12) > (In reply to comment #11) > > (From update of attachment 113717 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=113717&action=review > > > > It broke QtWebKit on Mac: > > Do you need this file on QtWebKit? It is to convert KURL to/from CFURL. Maybe this was added by accident? Alexis, have you got any idea? You usually hack QtWebKit on Mac. 497224 14 vestbo 2011-11-07 09:08:42 -0800 (In reply to comment #12) > (In reply to comment #11) > > (From update of attachment 113717 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=113717&action=review > > > > It broke QtWebKit on Mac: > > Do you need this file on QtWebKit? It is to convert KURL to/from CFURL. Maybe this was added by accident? We use it when we use the QuickTime media backend :/ Landed a buildfix in http://trac.webkit.org/changeset/99429 113622 2011-11-03 22:25:03 -0700 2011-11-04 14:38:05 -0700 Patch bug-71539-20111103222502.patch text/plain 3904 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyNTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMzk0YzYwYzE4ZTQ4NmZj MzU3MjQxZjQ2ZGVlZjU0MmJlMjIyYTIwLi4xYTExNzFhZTIzZTcwYTcwMGI1NTcwZjljZDhmNzY0 MDRhZGJmNDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTEtMDMgIEJlbmph bWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmVzb3Vy Y2VSZXF1ZXN0J3MgbnNVUkxSZXF1ZXN0KCkgZG9lcyBub3QgZGlmZmVyZW50aWF0ZSBudWxsIGFu ZCBlbXB0eSBVUkxzIHdpdGggQ0ZOZXR3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MTUzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluIG9yZGVyIHRvIGhhdmUgQ0ZVUkwgYW5kIE5TVVJMIHRvIGJl IGNvbnNpc3RlbnQgd2hlbiBib3RoIGFyZSB1c2VkIG9uIE1hYywKKyAgICAgICAgS1VSTDo6Y3Jl YXRlQ0ZVUkwoKSBpcyBjaGFuZ2VkIHRvIHN1cHBvcnQgZW1wdHkgVVJMIHZhbHVlcy4KKworICAg ICAgICAqIHBsYXRmb3JtL2NmL0tVUkxDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVh dGVDRlVSTEZyb21CdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6Y3JlYXRlQ0ZVUkwp OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9LVVJMTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 S1VSTDo6b3BlcmF0b3IgTlNVUkwgKik6CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjpjcmVhdGVD RlVSTCk6CisKIDIwMTEtMTEtMDMgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dIE5vdGlmeSBzY2hlZHVsZXIgb24gU3dhcEJ1ZmZlcnMg aW4gdGhyZWFkZWQgY29tcG9zaXRvciBtb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jZi9LVVJMQ0ZOZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvS1VS TENGTmV0LmNwcAppbmRleCBiYzg0OTA5NjgxMjQzYzJlZTdiMDdmNjdhYjVkOTc0ODIyZDAxNzYx Li43YjRmYTI2ZWRjNmNhMDEzZWU2NjdlZTMyZWIxZjc2YzMzNjgyNTFlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9LVVJMQ0ZOZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2NmL0tVUkxDRk5ldC5jcHAKQEAgLTMzLDYgKzMzLDggQEAgdXNpbmcgbmFt ZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitDRlVSTFJlZiBjcmVhdGVDRlVS TEZyb21CdWZmZXIoY29uc3QgVmVjdG9yPGNoYXIsIDUxMj4mIGJ1ZmZlcik7CisKIEtVUkw6OktV UkwoQ0ZVUkxSZWYgdXJsKQogewogICAgIGlmICghdXJsKSB7CkBAIC01OSwxNSArNjEsOCBAQCBL VVJMOjpLVVJMKENGVVJMUmVmIHVybCkKICAgICBwYXJzZShidWZmZXIuZGF0YSgpLCAwKTsKIH0K IAotQ0ZVUkxSZWYgS1VSTDo6Y3JlYXRlQ0ZVUkwoKSBjb25zdAorQ0ZVUkxSZWYgY3JlYXRlQ0ZV UkxGcm9tQnVmZmVyKGNvbnN0IFZlY3RvcjxjaGFyLCA1MTI+JiBidWZmZXIpCiB7Ci0gICAgLy8g RklYTUU6IFdoYXQgc2hvdWxkIHRoaXMgcmV0dXJuIGZvciBpbnZhbGlkIFVSTHM/Ci0gICAgLy8g Q3VycmVudGx5IGl0IHRocm93cyBhd2F5IHRoZSBoaWdoIGJ5dGVzIG9mIHRoZSBjaGFyYWN0ZXJz IGluIHRoZSBzdHJpbmcgaW4gdGhhdCBjYXNlLAotICAgIC8vIHdoaWNoIGlzIGNsZWFybHkgd3Jv bmcuCi0KLSAgICBWZWN0b3I8Y2hhciwgNTEyPiBidWZmZXI7Ci0gICAgY29weVRvQnVmZmVyKGJ1 ZmZlcik7Ci0KICAgICAvLyBOT1RFOiBXZSB1c2UgVVRGLTggaGVyZSBzaW5jZSB0aGlzIGVuY29k aW5nIGlzIHVzZWQgd2hlbiBjb21wdXRpbmcgc3RyaW5ncyB3aGVuIHJldHVybmluZyBVUkwgY29t cG9uZW50cwogICAgIC8vIChlLmcgY2FsbHMgdG8gTlNVUkwgLXBhdGgpLiBIb3dldmVyLCB0aGlz IGZ1bmN0aW9uIGlzIG5vdCB0b2xlcmFudCBvZiBpbGxlZ2FsIFVURi04IHNlcXVlbmNlcywgd2hp Y2gKICAgICAvLyBjb3VsZCBlaXRoZXIgYmUgYSBtYWxmb3JtZWQgc3RyaW5nIG9yIGJ5dGVzIGlu IGEgZGlmZmVyZW50IGVuY29kaW5nLCBsaWtlIFNoaWZ0LUpJUywgc28gd2UgZmFsbCBiYWNrCkBA IC03OCw2ICs3MywxOCBAQCBDRlVSTFJlZiBLVVJMOjpjcmVhdGVDRlVSTCgpIGNvbnN0CiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIAorI2lmICFQTEFURk9STShNQUMpCitDRlVSTFJlZiBLVVJMOjpj cmVhdGVDRlVSTCgpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IFdoYXQgc2hvdWxkIHRoaXMgcmV0 dXJuIGZvciBpbnZhbGlkIFVSTHM/CisgICAgLy8gQ3VycmVudGx5IGl0IHRocm93cyBhd2F5IHRo ZSBoaWdoIGJ5dGVzIG9mIHRoZSBjaGFyYWN0ZXJzIGluIHRoZSBzdHJpbmcgaW4gdGhhdCBjYXNl LAorICAgIC8vIHdoaWNoIGlzIGNsZWFybHkgd3JvbmcuCisgICAgQ2hhckJ1ZmZlciBidWZmZXI7 CisgICAgY29weVRvQnVmZmVyKGJ1ZmZlcik7CisgICAgcmV0dXJuIGNyZWF0ZUNGVVJMRnJvbUJ1 ZmZlcihidWZmZXIpOworfQorI2VuZGlmCisKICNpZiAhKFBMQVRGT1JNKFFUKSAmJiBVU0UoUVRL SVQpKQogU3RyaW5nIEtVUkw6OmZpbGVTeXN0ZW1QYXRoKCkgY29uc3QKIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9LVVJMTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL0tVUkxNYWMubW0KaW5kZXggZTZmZWVjMWYzODlkYmEyZGZlYTllZjZlZGY2 MWMyMjM5YjJiNGM0Ny4uZmZiOGNlNDBhMDBmODY5YTZiOTdlY2U0MDhkOWI4Mjk0OGVhZjU5MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0tVUkxNYWMubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0tVUkxNYWMubW0KQEAgLTMxLDYgKzMxLDggQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitleHRlcm4gQ0ZVUkxSZWYgY3JlYXRlQ0ZVUkxGcm9t QnVmZmVyKGNvbnN0IFZlY3RvcjxjaGFyLCA1MTI+JiBidWZmZXIpOworCiBLVVJMOjpLVVJMKE5T VVJMICp1cmwpCiB7CiAgICAgaWYgKCF1cmwpIHsKQEAgLTU5LDE0ICs2MSwyMiBAQCBLVVJMOjpL VVJMKE5TVVJMICp1cmwpCiAKIEtVUkw6Om9wZXJhdG9yIE5TVVJMICooKSBjb25zdAogeworICAg IHJldHVybiBIYXJkQXV0b3JlbGVhc2UoY3JlYXRlQ0ZVUkwoKSk7Cit9CisKKy8vIFdlIHVzZSB0 aGUgdG9sbC1mcmVlIGJyaWRnZSBiZXR3ZWVuIE5TVVJMIGFuZCBDRlVSTCB0bworLy8gY3JlYXRl IGEgQ0ZVUkxSZWYgc3VwcG9ydGluZyBib3RoIGVtcHR5IGFuZCBudWxsIHZhbHVlcy4KK0NGVVJM UmVmIEtVUkw6OmNyZWF0ZUNGVVJMKCkgY29uc3QKK3sKICAgICBpZiAoaXNOdWxsKCkpCi0gICAg ICAgIHJldHVybiBuaWw7CisgICAgICAgIHJldHVybiAwOwogCi0gICAgLy8gQ0ZVUkwgY2FuJ3Qg aG9sZCBhbiBlbXB0eSBVUkwsIHVubGlrZSBOU1VSTC4KICAgICBpZiAoaXNFbXB0eSgpKQotICAg ICAgICByZXR1cm4gW05TVVJMIFVSTFdpdGhTdHJpbmc6QCIiXTsKKyAgICAgICAgcmV0dXJuIChD RlVSTFJlZilbW05TVVJMIGFsbG9jXSBpbml0V2l0aFN0cmluZzpAIiJdOwogCi0gICAgcmV0dXJu IEhhcmRBdXRvcmVsZWFzZShjcmVhdGVDRlVSTCgpKTsKKyAgICBWZWN0b3I8Y2hhciwgNTEyPiBi dWZmZXI7CisgICAgY29weVRvQnVmZmVyKGJ1ZmZlcik7CisgICAgcmV0dXJuIGNyZWF0ZUNGVVJM RnJvbUJ1ZmZlcihidWZmZXIpOwogfQogCiB9Cg== 113717 2011-11-04 14:38:08 -0700 2011-11-06 14:53:59 -0800 Patch bug-71539-20111104143807.patch text/plain 3948 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogOTkzMDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MmFhMmNmOTg1YWU2ZTU3 ZTI0ODM2ZGYzZTMxNTUwZTlmOGRiODE0Li5iOWJlZjk3YmMzNjMwMzgyMWZlZTAwMjlhZDI4Y2Ey ZThkYjFiN2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTEtMDMgIEJlbmph bWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmVzb3Vy Y2VSZXF1ZXN0J3MgbnNVUkxSZXF1ZXN0KCkgZG9lcyBub3QgZGlmZmVyZW50aWF0ZSBudWxsIGFu ZCBlbXB0eSBVUkxzIHdpdGggQ0ZOZXR3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MTUzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluIG9yZGVyIHRvIGhhdmUgQ0ZVUkwgYW5kIE5TVVJMIHRvIGJl IGNvbnNpc3RlbnQgd2hlbiBib3RoIGFyZSB1c2VkIG9uIE1hYywKKyAgICAgICAgS1VSTDo6Y3Jl YXRlQ0ZVUkwoKSBpcyBjaGFuZ2VkIHRvIHN1cHBvcnQgZW1wdHkgVVJMIHZhbHVlcy4KKworICAg ICAgICAqIHBsYXRmb3JtL2NmL0tVUkxDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVh dGVDRlVSTEZyb21CdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6Y3JlYXRlQ0ZVUkwp OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9LVVJMTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 S1VSTDo6b3BlcmF0b3IgTlNVUkwgKik6CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjpjcmVhdGVD RlVSTCk6CisKIDIwMTEtMTEtMDQgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+ CiAKICAgICAgICAgQ29ycmVjdCBwYXJzaW5nIG9mIGluY29tcGxldGUgQC13ZWJraXQtcmVnaW9u IHJ1bGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvS1VSTENGTmV0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0tVUkxDRk5ldC5jcHAKaW5kZXggYmM4 NDkwOTY4MTI0M2MyZWU3YjA3ZjY3YWI1ZDk3NDgyMmQwMTc2MS4uNTQ2ZjZiMGVkODZhMDU1NWI0 ZTFjMzZmZmEyZjg1ZTQ1ZjY1ZjlkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2YvS1VSTENGTmV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9LVVJM Q0ZOZXQuY3BwCkBAIC0zMyw2ICszMywxMCBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKK3R5cGVkZWYgVmVjdG9yPGNoYXIsIDUxMj4gQ2hhckJ1ZmZlcjsK KworQ0ZVUkxSZWYgY3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGNvbnN0IENoYXJCdWZmZXImKTsKKwog S1VSTDo6S1VSTChDRlVSTFJlZiB1cmwpCiB7CiAgICAgaWYgKCF1cmwpIHsKQEAgLTU5LDE1ICs2 Myw4IEBAIEtVUkw6OktVUkwoQ0ZVUkxSZWYgdXJsKQogICAgIHBhcnNlKGJ1ZmZlci5kYXRhKCks IDApOwogfQogCi1DRlVSTFJlZiBLVVJMOjpjcmVhdGVDRlVSTCgpIGNvbnN0CitDRlVSTFJlZiBj cmVhdGVDRlVSTEZyb21CdWZmZXIoY29uc3QgQ2hhckJ1ZmZlciYgYnVmZmVyKQogewotICAgIC8v IEZJWE1FOiBXaGF0IHNob3VsZCB0aGlzIHJldHVybiBmb3IgaW52YWxpZCBVUkxzPwotICAgIC8v IEN1cnJlbnRseSBpdCB0aHJvd3MgYXdheSB0aGUgaGlnaCBieXRlcyBvZiB0aGUgY2hhcmFjdGVy cyBpbiB0aGUgc3RyaW5nIGluIHRoYXQgY2FzZSwKLSAgICAvLyB3aGljaCBpcyBjbGVhcmx5IHdy b25nLgotCi0gICAgVmVjdG9yPGNoYXIsIDUxMj4gYnVmZmVyOwotICAgIGNvcHlUb0J1ZmZlcihi dWZmZXIpOwotCiAgICAgLy8gTk9URTogV2UgdXNlIFVURi04IGhlcmUgc2luY2UgdGhpcyBlbmNv ZGluZyBpcyB1c2VkIHdoZW4gY29tcHV0aW5nIHN0cmluZ3Mgd2hlbiByZXR1cm5pbmcgVVJMIGNv bXBvbmVudHMKICAgICAvLyAoZS5nIGNhbGxzIHRvIE5TVVJMIC1wYXRoKS4gSG93ZXZlciwgdGhp cyBmdW5jdGlvbiBpcyBub3QgdG9sZXJhbnQgb2YgaWxsZWdhbCBVVEYtOCBzZXF1ZW5jZXMsIHdo aWNoCiAgICAgLy8gY291bGQgZWl0aGVyIGJlIGEgbWFsZm9ybWVkIHN0cmluZyBvciBieXRlcyBp biBhIGRpZmZlcmVudCBlbmNvZGluZywgbGlrZSBTaGlmdC1KSVMsIHNvIHdlIGZhbGwgYmFjawpA QCAtNzgsNiArNzUsMTggQEAgQ0ZVUkxSZWYgS1VSTDo6Y3JlYXRlQ0ZVUkwoKSBjb25zdAogICAg IHJldHVybiByZXN1bHQ7CiB9CiAKKyNpZiAhUExBVEZPUk0oTUFDKQorQ0ZVUkxSZWYgS1VSTDo6 Y3JlYXRlQ0ZVUkwoKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBXaGF0IHNob3VsZCB0aGlzIHJl dHVybiBmb3IgaW52YWxpZCBVUkxzPworICAgIC8vIEN1cnJlbnRseSBpdCB0aHJvd3MgYXdheSB0 aGUgaGlnaCBieXRlcyBvZiB0aGUgY2hhcmFjdGVycyBpbiB0aGUgc3RyaW5nIGluIHRoYXQgY2Fz ZSwKKyAgICAvLyB3aGljaCBpcyBjbGVhcmx5IHdyb25nLgorICAgIENoYXJCdWZmZXIgYnVmZmVy OworICAgIGNvcHlUb0J1ZmZlcihidWZmZXIpOworICAgIHJldHVybiBjcmVhdGVDRlVSTEZyb21C dWZmZXIoYnVmZmVyKTsKK30KKyNlbmRpZgorCiAjaWYgIShQTEFURk9STShRVCkgJiYgVVNFKFFU S0lUKSkKIFN0cmluZyBLVVJMOjpmaWxlU3lzdGVtUGF0aCgpIGNvbnN0CiB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvS1VSTE1hYy5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9LVVJMTWFjLm1tCmluZGV4IGU2ZmVlYzFmMzg5ZGJhMmRmZWE5ZWY2ZWRm NjFjMjIzOWIyYjRjNDcuLjFhMTE0YmZjZjNmZmZlNDFkNTBjNmMyYTY1NzRkMTI1OTc1MjQxNmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9LVVJMTWFjLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9LVVJMTWFjLm1tCkBAIC0zMSw2ICszMSw5IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAordHlwZWRlZiBWZWN0b3I8Y2hhciwgNTEyPiBDaGFy QnVmZmVyOworZXh0ZXJuIENGVVJMUmVmIGNyZWF0ZUNGVVJMRnJvbUJ1ZmZlcihjb25zdCBDaGFy QnVmZmVyJiBidWZmZXIpOworCiBLVVJMOjpLVVJMKE5TVVJMICp1cmwpCiB7CiAgICAgaWYgKCF1 cmwpIHsKQEAgLTU5LDE0ICs2MiwyMiBAQCBLVVJMOjpLVVJMKE5TVVJMICp1cmwpCiAKIEtVUkw6 Om9wZXJhdG9yIE5TVVJMICooKSBjb25zdAogeworICAgIHJldHVybiBIYXJkQXV0b3JlbGVhc2Uo Y3JlYXRlQ0ZVUkwoKSk7Cit9CisKKy8vIFdlIHVzZSB0aGUgdG9sbC1mcmVlIGJyaWRnZSBiZXR3 ZWVuIE5TVVJMIGFuZCBDRlVSTCB0bworLy8gY3JlYXRlIGEgQ0ZVUkxSZWYgc3VwcG9ydGluZyBi b3RoIGVtcHR5IGFuZCBudWxsIHZhbHVlcy4KK0NGVVJMUmVmIEtVUkw6OmNyZWF0ZUNGVVJMKCkg Y29uc3QKK3sKICAgICBpZiAoaXNOdWxsKCkpCi0gICAgICAgIHJldHVybiBuaWw7CisgICAgICAg IHJldHVybiAwOwogCi0gICAgLy8gQ0ZVUkwgY2FuJ3QgaG9sZCBhbiBlbXB0eSBVUkwsIHVubGlr ZSBOU1VSTC4KICAgICBpZiAoaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gW05TVVJMIFVSTFdp dGhTdHJpbmc6QCIiXTsKKyAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Q0ZVUkxSZWY+ KFtbTlNVUkwgYWxsb2NdIGluaXRXaXRoU3RyaW5nOkAiIl0pOwogCi0gICAgcmV0dXJuIEhhcmRB dXRvcmVsZWFzZShjcmVhdGVDRlVSTCgpKTsKKyAgICBDaGFyQnVmZmVyIGJ1ZmZlcjsKKyAgICBj b3B5VG9CdWZmZXIoYnVmZmVyKTsKKyAgICByZXR1cm4gY3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGJ1 ZmZlcik7CiB9CiAKIH0K