109947 2013-02-15 08:23:23 -0800 Add CString operators for comparison with const char* 2013-02-16 00:53:20 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez andersca ap benjamin cmarcelo laszlo.gombos ojan.autocc roger_fong webkit.review.bot oldest_to_newest 834048 0 cdumez 2013-02-15 08:23:23 -0800 CString currently has the following comparison operators: bool operator==(const CString& a, const CString& b); inline bool operator!=(const CString& a, const CString& b); This means that if the caller does: CString testString = "a"; if (testString == "a") // ... It will construct a CString from the const char*, which involves a copy and a call to strlen(). I have seen such CString / const char* comparison done in WebKit. We could add the following comparison operators to CString in order to make sure such comparison code is not expensive: bool operator==(const CString& a, const char* b); inline bool operator!=(const CString& a, const char* b); 834052 1 188579 cdumez 2013-02-15 08:31:24 -0800 Created attachment 188579 Patch 834110 2 188579 darin 2013-02-15 09:42:27 -0800 Comment on attachment 188579 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188579&action=review Seems OK. Please fix the memcmp issue too if you are touching this code. > Source/WTF/wtf/text/CString.cpp:113 > + return !strncmp(a.data(), b.data(), a.length()); This code should use memcmp. We don’t want the code to scan for null characters, so strncmp is the wrong function. 834144 3 188579 benjamin 2013-02-15 10:26:02 -0800 Comment on attachment 188579 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188579&action=review This is great. Some comment bellow: >> Source/WTF/wtf/text/CString.cpp:113 >> + return !strncmp(a.data(), b.data(), a.length()); > > This code should use memcmp. We don’t want the code to scan for null characters, so strncmp is the wrong function. Or StringImpl's equal(LChar, LChar, size_t). > Source/WTF/wtf/text/CString.cpp:116 > +bool operator==(const CString& a, const char* b) Would it be useful to have a version for literal?: template<size_t bLength> bool operator==(const CString& a, const char (&b)[bLength]) You could have compile assertions for bLength > 0, remove both branches, and go straight to memcmp/equal. > Tools/TestWebKitAPI/Tests/WTF/CString.cpp:135 > + CString c; > + const char* d = 0; > + ASSERT_TRUE(c == d); > + ASSERT_FALSE(c != d); Another interesting boundary is empty string. 834160 4 cdumez 2013-02-15 10:35:15 -0800 (In reply to comment #3) > (From update of attachment 188579 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188579&action=review > > This is great. Some comment bellow: > > >> Source/WTF/wtf/text/CString.cpp:113 > >> + return !strncmp(a.data(), b.data(), a.length()); > > > > This code should use memcmp. We don’t want the code to scan for null characters, so strncmp is the wrong function. > > Or StringImpl's equal(LChar, LChar, size_t). > > > Source/WTF/wtf/text/CString.cpp:116 > > +bool operator==(const CString& a, const char* b) > > Would it be useful to have a version for literal?: > template<size_t bLength> > bool operator==(const CString& a, const char (&b)[bLength]) > > You could have compile assertions for bLength > 0, remove both branches, and go straight to memcmp/equal. Would you like me to add it in the same patch? > > > Tools/TestWebKitAPI/Tests/WTF/CString.cpp:135 > > + CString c; > > + const char* d = 0; > > + ASSERT_TRUE(c == d); > > + ASSERT_FALSE(c != d); > > Another interesting boundary is empty string. Right, I forgot about this case. I'll improve the test case, thanks. 834163 5 ap 2013-02-15 10:38:18 -0800 What code needs to compare CString to a literal? I think of CString as a temporary object for platform interfaces, not something that should be used in places that have logic. 834166 6 benjamin 2013-02-15 10:48:50 -0800 (In reply to comment #5) > What code needs to compare CString to a literal? EFL uses CString quite a bit, which is why I ask. 834171 7 cdumez 2013-02-15 10:52:48 -0800 I don't know that the literal version would be useful yet. However, I have seen code in the soup backend comparing CString to const char* values returned by libsoup. Can I keep the patch as it is then and simply improve the test case as suggested by Benjamin? 834176 8 benjamin 2013-02-15 10:56:33 -0800 (In reply to comment #7) > Can I keep the patch as it is then and simply improve the test case as suggested by Benjamin? Yep + the comments of Darin. :) 834177 9 cdumez 2013-02-15 10:57:06 -0800 (In reply to comment #8) > (In reply to comment #7) > > Can I keep the patch as it is then and simply improve the test case as suggested by Benjamin? > > Yep + the comments of Darin. :) Of course :) 834215 10 188608 cdumez 2013-02-15 11:33:56 -0800 Created attachment 188608 Patch for landing Could someone please take a quick look before landing? 834315 11 188608 benjamin 2013-02-15 13:17:53 -0800 Comment on attachment 188608 Patch for landing Thank you for updating the test. 834358 12 188608 webkit.review.bot 2013-02-15 13:54:46 -0800 Comment on attachment 188608 Patch for landing Clearing flags on attachment: 188608 Committed r143049: <http://trac.webkit.org/changeset/143049> 834359 13 webkit.review.bot 2013-02-15 13:54:51 -0800 All reviewed patches have been landed. Closing bug. 834588 14 roger_fong 2013-02-15 18:47:17 -0800 This broke the Windows build. Here's the output: http://build-safari.apple.com/builders/Windows%20Release%20Archive/builds/19153/steps/build%20archive/logs/build%20log Win EWS bots are really far behind :( ... might be why they bubble doesn't show up. 834607 15 benjamin 2013-02-15 19:16:53 -0800 (In reply to comment #14) > This broke the Windows build. > Here's the output: > http://build-safari.apple.com/builders/Windows%20Release%20Archive/builds/19153/steps/build%20archive/logs/build%20log > > Win EWS bots are really far behind :( ... might be why they bubble doesn't show up. It cannot find the symbol for the new operator==. Is it because of WTF_EXPORT_PRIVATE? I forgot the difference between WTF_EXPORT_STRING_API, WTF_EXPORT_PRIVATE and WTF_EXPORT 834660 16 cdumez 2013-02-15 23:56:52 -0800 (In reply to comment #15) > (In reply to comment #14) > > This broke the Windows build. > > Here's the output: > > http://build-safari.apple.com/builders/Windows%20Release%20Archive/builds/19153/steps/build%20archive/logs/build%20log > > > > Win EWS bots are really far behind :( ... might be why they bubble doesn't show up. > > It cannot find the symbol for the new operator==. Is it because of WTF_EXPORT_PRIVATE? > I forgot the difference between WTF_EXPORT_STRING_API, WTF_EXPORT_PRIVATE and WTF_EXPORT Sorry about that. According to http://trac.webkit.org/wiki/ExportingSymbols, we need to add the new symbol to JavaScriptCoreExports.def in addition to using WTF_EXPORT_PRIVATE. However, it seems build.webkit.org and your link are both inaccessible at the moment :/ 834671 17 cdumez 2013-02-16 00:53:20 -0800 Windows build fix landed in http://trac.webkit.org/changeset/143099. 188579 2013-02-15 08:31:24 -0800 2013-02-15 11:33:56 -0800 Patch 109947_cstring_comparison.patch text/plain 4098 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggNzlmNjQwNi4uYjhlNjBkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMy0wMi0xNSAg Q2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAg QWRkIENTdHJpbmcgb3BlcmF0b3JzIGZvciBjb21wYXJpc29uIHdpdGggY29uc3QgY2hhcioKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTk0NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBvcGVyYXRv cnMgdG8gV1RGOjpDU3RyaW5nIGZvciBlcXVhbGl0eS9pbmVxdWFsaXR5IGNvbXBhcmlzb24KKyAg ICAgICAgd2l0aCBjb25zdCBjaGFyKiBzdHJpbmdzLiBUaGlzIGF2b2lkcyBjb25zdHJ1Y3Rpbmcg YSBDU3RyaW5nCisgICAgICAgIGZyb20gYSBjb25zdCBjaGFyKiBpbiBzdWNoIGNhc2VzLCB3aGlj aCBpcyBjYW4gYmUgZXhwZW5zaXZlIGFzCisgICAgICAgIGl0IHdvdWxkIGNvcHkgaXQgYW5kIGNh bGwgc3RybGVuKCkuCisKKyAgICAgICAgKiB3dGYvdGV4dC9DU3RyaW5nLmNwcDoKKyAgICAgICAg KFdURjo6b3BlcmF0b3I9PSk6IFJlbW92ZSB1c2VsZXNzIGNhbGwgdG8gbWluKCkgZm9yIHRoZSBs ZW5ndGhzCisgICAgICAgIHdoZW4gY2FsbGluZyBzdHJuY21wKCkgYXMgdGhlIGxlbmd0aHMgd2Vy ZSBjaGVja2VkIHRvIGJlIGVxdWFsCisgICAgICAgIGJlZm9yZS4KKyAgICAgICAgKFdURik6Cisg ICAgICAgICogd3RmL3RleHQvQ1N0cmluZy5oOgorICAgICAgICAoV1RGKToKKyAgICAgICAgKFdU Rjo6b3BlcmF0b3IhPSk6CisKIDIwMTMtMDItMTQgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxl LmNvbT4KIAogICAgICAgICBObyBlYXN5IHdheSB0byB1c2UgYSBSZXRhaW5QdHIgYXMgYSBrZXkg aW4gYSBIYXNoTWFwIHVzaW5nIG9iamVjdCAocmF0aGVyIHRoYW4gcG9pbnRlcikgZXF1YWxpdHkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RleHQvQ1N0cmluZy5jcHAgYi9Tb3VyY2UvV1RG L3d0Zi90ZXh0L0NTdHJpbmcuY3BwCmluZGV4IDg2MTkzY2UuLjYwNDYxYmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvd3RmL3RleHQvQ1N0cmluZy5jcHAKKysrIGIvU291cmNlL1dURi93dGYvdGV4 dC9DU3RyaW5nLmNwcApAQCAtMTEwLDcgKzExMCwxNyBAQCBib29sIG9wZXJhdG9yPT0oY29uc3Qg Q1N0cmluZyYgYSwgY29uc3QgQ1N0cmluZyYgYikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IGlmIChhLmxlbmd0aCgpICE9IGIubGVuZ3RoKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICByZXR1cm4gIXN0cm5jbXAoYS5kYXRhKCksIGIuZGF0YSgpLCBtaW4oYS5sZW5ndGgoKSwgYi5s ZW5ndGgoKSkpOworICAgIHJldHVybiAhc3RybmNtcChhLmRhdGEoKSwgYi5kYXRhKCksIGEubGVu Z3RoKCkpOworfQorCitib29sIG9wZXJhdG9yPT0oY29uc3QgQ1N0cmluZyYgYSwgY29uc3QgY2hh ciogYikKK3sKKyAgICBpZiAoYS5pc051bGwoKSAhPSAhYikKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghYikKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1cm4gIXN0cmNt cChhLmRhdGEoKSwgYik7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdURgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi93dGYvdGV4dC9DU3RyaW5nLmggYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L0NTdHJpbmcu aAppbmRleCAxZGY5ZjZiLi45NGYwYTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0 L0NTdHJpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L0NTdHJpbmcuaApAQCAtODQsNiAr ODQsOCBAQCBwcml2YXRlOgogCiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBvcGVyYXRvcj09KGNv bnN0IENTdHJpbmcmIGEsIGNvbnN0IENTdHJpbmcmIGIpOwogaW5saW5lIGJvb2wgb3BlcmF0b3Ih PShjb25zdCBDU3RyaW5nJiBhLCBjb25zdCBDU3RyaW5nJiBiKSB7IHJldHVybiAhKGEgPT0gYik7 IH0KK1dURl9FWFBPUlRfUFJJVkFURSBib29sIG9wZXJhdG9yPT0oY29uc3QgQ1N0cmluZyYgYSwg Y29uc3QgY2hhciogYik7CitpbmxpbmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0IENTdHJpbmcmIGEs IGNvbnN0IGNoYXIqIGIpIHsgcmV0dXJuICEoYSA9PSBiKTsgfQogCiB9IC8vIG5hbWVzcGFjZSBX VEYKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDI4Mzk4ZGUuLjlmZmM2NWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMi0xNSAgQ2hyaXN0b3BoZSBEdW1l eiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAgQWRkIENTdHJpbmcgb3Bl cmF0b3JzIGZvciBjb21wYXJpc29uIHdpdGggY29uc3QgY2hhcioKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTk0NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyBmb3IgV1RGOjpDU3RyaW5n J3MgY29tcGFyaXNvbiBvcGVyYXRvcnMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dURi9DU3RyaW5nLmNwcDoKKyAgICAgICAgKFRFU1QpOgorCiAyMDEzLTAyLTE1ICBBbmRyZXkg THVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBpbXBsZW1lbnQgc21hcnQgYnJhY2VzIGZ1bmN0aW9uYWxpdHkKZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0NTdHJpbmcuY3BwIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XVEYvQ1N0cmluZy5jcHAKaW5kZXggMWY0N2NiMi4uYWVhZTUwNSAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQ1N0cmluZy5jcHAKKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQ1N0cmluZy5jcHAKQEAgLTEwNywzICsxMDcsNDIg QEAgVEVTVChXVEYsIENTdHJpbmdDb3B5T25Xcml0ZSkKICAgICBBU1NFUlRfU1RSRVEoc3RyaW5n LmRhdGEoKSwgIldlYktpdCIpOwogICAgIEFTU0VSVF9TVFJFUShjb3B5LmRhdGEoKSwgaW5pdGlh bFN0cmluZyk7CiB9CisKK1RFU1QoV1RGLCBDU3RyaW5nQ29tcGFyaXNvbikKK3sKKyAgICAvLyBD b21wYXJpc29uIHdpdGggYW5vdGhlciBDU3RyaW5nLgorICAgIENTdHJpbmcgYTsKKyAgICBDU3Ry aW5nIGI7CisgICAgQVNTRVJUX1RSVUUoYSA9PSBiKTsKKyAgICBBU1NFUlRfRkFMU0UoYSAhPSBi KTsKKyAgICBhID0gImEiOworICAgIEFTU0VSVF9GQUxTRShhID09IGIpOworICAgIEFTU0VSVF9U UlVFKGEgIT0gYik7CisgICAgYiA9ICJiIjsKKyAgICBBU1NFUlRfRkFMU0UoYSA9PSBiKTsKKyAg ICBBU1NFUlRfVFJVRShhICE9IGIpOworICAgIGIgPSAiYSI7CisgICAgQVNTRVJUX1RSVUUoYSA9 PSBiKTsKKyAgICBBU1NFUlRfRkFMU0UoYSAhPSBiKTsKKyAgICBiID0gImFhIjsKKyAgICBBU1NF UlRfRkFMU0UoYSA9PSBiKTsKKyAgICBBU1NFUlRfVFJVRShhICE9IGIpOworCisgICAgLy8gQ29t cGFyaXNvbiB3aXRoIGEgY29uc3QgY2hhciouCisgICAgQ1N0cmluZyBjOworICAgIGNvbnN0IGNo YXIqIGQgPSAwOworICAgIEFTU0VSVF9UUlVFKGMgPT0gZCk7CisgICAgQVNTRVJUX0ZBTFNFKGMg IT0gZCk7CisgICAgYyA9ICJjIjsKKyAgICBBU1NFUlRfRkFMU0UoYyA9PSBkKTsKKyAgICBBU1NF UlRfVFJVRShjICE9IGQpOworICAgIGQgPSAiZCI7CisgICAgQVNTRVJUX0ZBTFNFKGMgPT0gZCk7 CisgICAgQVNTRVJUX1RSVUUoYyAhPSBkKTsKKyAgICBkID0gImMiOworICAgIEFTU0VSVF9UUlVF KGMgPT0gZCk7CisgICAgQVNTRVJUX0ZBTFNFKGMgIT0gZCk7CisgICAgZCA9ICJjYyI7CisgICAg QVNTRVJUX0ZBTFNFKGMgPT0gZCk7CisgICAgQVNTRVJUX1RSVUUoYyAhPSBkKTsKK30K 188608 2013-02-15 11:33:56 -0800 2013-02-15 13:54:46 -0800 Patch for landing 109947_cstring_comparison.patch text/plain 5054 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggNzlmNjQwNi4uM2ZjMTk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMy0wMi0xNSAg Q2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAg QWRkIENTdHJpbmcgb3BlcmF0b3JzIGZvciBjb21wYXJpc29uIHdpdGggY29uc3QgY2hhcioKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTk0NworCisg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEFkZCBvcGVyYXRvcnMg dG8gV1RGOjpDU3RyaW5nIGZvciBlcXVhbGl0eS9pbmVxdWFsaXR5IGNvbXBhcmlzb24KKyAgICAg ICAgd2l0aCBjb25zdCBjaGFyKiBzdHJpbmdzLiBUaGlzIGF2b2lkcyBjb25zdHJ1Y3RpbmcgYSBD U3RyaW5nCisgICAgICAgIGZyb20gYSBjb25zdCBjaGFyKiBpbiBzdWNoIGNhc2VzLCB3aGljaCBp cyBjYW4gYmUgZXhwZW5zaXZlIGFzCisgICAgICAgIGl0IHdvdWxkIGNvcHkgaXQgYW5kIGNhbGwg c3RybGVuKCkuCisKKyAgICAgICAgKiB3dGYvdGV4dC9DU3RyaW5nLmNwcDoKKyAgICAgICAgKFdU Rjo6b3BlcmF0b3I9PSk6IFVzZSBtZW1jbXAgaW5zdGVhZCBvZiBzdHJuY21wIHRvIGNvbXBhcmUg dGhlCisgICAgICAgIENTdHJpbmcgYnVmZmVycyBhcyB3ZSBrbm93IHRoZXkgYXJlIHRoZSBzYW1l IHNpemUgYW5kIHdlIGRvbid0CisgICAgICAgIHdhbnQgdG8gc2NhbiBmb3IgdGVybWluYXRpbmcg bnVsbCBieXRlLgorICAgICAgICAoV1RGKToKKyAgICAgICAgKiB3dGYvdGV4dC9DU3RyaW5nLmg6 CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjpvcGVyYXRvciE9KToKKwogMjAxMy0wMi0x NCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIE5vIGVhc3kgd2F5 IHRvIHVzZSBhIFJldGFpblB0ciBhcyBhIGtleSBpbiBhIEhhc2hNYXAgdXNpbmcgb2JqZWN0IChy YXRoZXIgdGhhbiBwb2ludGVyKSBlcXVhbGl0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv dGV4dC9DU3RyaW5nLmNwcCBiL1NvdXJjZS9XVEYvd3RmL3RleHQvQ1N0cmluZy5jcHAKaW5kZXgg ODYxOTNjZS4uZmZkZGNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvdGV4dC9DU3RyaW5n LmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L0NTdHJpbmcuY3BwCkBAIC0xMTAsNyArMTEw LDE2IEBAIGJvb2wgb3BlcmF0b3I9PShjb25zdCBDU3RyaW5nJiBhLCBjb25zdCBDU3RyaW5nJiBi KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKGEubGVuZ3RoKCkgIT0gYi5sZW5ndGgo KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiAhc3RybmNtcChhLmRhdGEoKSwg Yi5kYXRhKCksIG1pbihhLmxlbmd0aCgpLCBiLmxlbmd0aCgpKSk7CisgICAgcmV0dXJuICFtZW1j bXAoYS5kYXRhKCksIGIuZGF0YSgpLCBhLmxlbmd0aCgpKTsKK30KKworYm9vbCBvcGVyYXRvcj09 KGNvbnN0IENTdHJpbmcmIGEsIGNvbnN0IGNoYXIqIGIpCit7CisgICAgaWYgKGEuaXNOdWxsKCkg IT0gIWIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWIpCisgICAgICAgIHJldHVy biB0cnVlOworICAgIHJldHVybiAhc3RyY21wKGEuZGF0YSgpLCBiKTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L0NTdHJpbmcuaCBiL1Nv dXJjZS9XVEYvd3RmL3RleHQvQ1N0cmluZy5oCmluZGV4IDFkZjlmNmIuLjk0ZjBhMTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvQ1N0cmluZy5oCisrKyBiL1NvdXJjZS9XVEYvd3Rm L3RleHQvQ1N0cmluZy5oCkBAIC04NCw2ICs4NCw4IEBAIHByaXZhdGU6CiAKIFdURl9FWFBPUlRf UFJJVkFURSBib29sIG9wZXJhdG9yPT0oY29uc3QgQ1N0cmluZyYgYSwgY29uc3QgQ1N0cmluZyYg Yik7CiBpbmxpbmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0IENTdHJpbmcmIGEsIGNvbnN0IENTdHJp bmcmIGIpIHsgcmV0dXJuICEoYSA9PSBiKTsgfQorV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgb3Bl cmF0b3I9PShjb25zdCBDU3RyaW5nJiBhLCBjb25zdCBjaGFyKiBiKTsKK2lubGluZSBib29sIG9w ZXJhdG9yIT0oY29uc3QgQ1N0cmluZyYgYSwgY29uc3QgY2hhciogYikgeyByZXR1cm4gIShhID09 IGIpOyB9CiAKIH0gLy8gbmFtZXNwYWNlIFdURgogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjgzOThkZS4uMTZjNjVlZSAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisy MDEzLTAyLTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNvbT4K KworICAgICAgICBBZGQgQ1N0cmluZyBvcGVyYXRvcnMgZm9yIGNvbXBhcmlzb24gd2l0aCBjb25z dCBjaGFyKgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA5OTQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRk IHRlc3RzIGZvciBXVEY6OkNTdHJpbmcncyBjb21wYXJpc29uIG9wZXJhdG9ycy4KKworICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0NTdHJpbmcuY3BwOgorICAgICAgICAoVEVTVCk6 CisKIDIwMTMtMDItMTUgIEFuZHJleSBMdXNobmlrb3YgIDxsdXNobmlrb3ZAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGltcGxlbWVudCBzbWFydCBicmFjZXMgZnVuY3Rp b25hbGl0eQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQ1N0cmlu Zy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9DU3RyaW5nLmNwcAppbmRleCAx ZjQ3Y2IyLi43MzVkN2RkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dU Ri9DU3RyaW5nLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9DU3RyaW5n LmNwcApAQCAtMTA3LDMgKzEwNyw5MCBAQCBURVNUKFdURiwgQ1N0cmluZ0NvcHlPbldyaXRlKQog ICAgIEFTU0VSVF9TVFJFUShzdHJpbmcuZGF0YSgpLCAiV2ViS2l0Iik7CiAgICAgQVNTRVJUX1NU UkVRKGNvcHkuZGF0YSgpLCBpbml0aWFsU3RyaW5nKTsKIH0KKworVEVTVChXVEYsIENTdHJpbmdD b21wYXJpc29uKQoreworICAgIC8vIENvbXBhcmlzb24gd2l0aCBhbm90aGVyIENTdHJpbmcuCisg ICAgQ1N0cmluZyBhOworICAgIENTdHJpbmcgYjsKKyAgICBBU1NFUlRfVFJVRShhID09IGIpOwor ICAgIEFTU0VSVF9GQUxTRShhICE9IGIpOworICAgIGEgPSAiYSI7CisgICAgYiA9IENTdHJpbmco KTsKKyAgICBBU1NFUlRfRkFMU0UoYSA9PSBiKTsKKyAgICBBU1NFUlRfVFJVRShhICE9IGIpOwor ICAgIGEgPSAiYSI7CisgICAgYiA9ICJiIjsKKyAgICBBU1NFUlRfRkFMU0UoYSA9PSBiKTsKKyAg ICBBU1NFUlRfVFJVRShhICE9IGIpOworICAgIGEgPSAiYSI7CisgICAgYiA9ICJhIjsKKyAgICBB U1NFUlRfVFJVRShhID09IGIpOworICAgIEFTU0VSVF9GQUxTRShhICE9IGIpOworICAgIGEgPSAi YSI7CisgICAgYiA9ICJhYSI7CisgICAgQVNTRVJUX0ZBTFNFKGEgPT0gYik7CisgICAgQVNTRVJU X1RSVUUoYSAhPSBiKTsKKyAgICBhID0gIiI7CisgICAgYiA9ICIiOworICAgIEFTU0VSVF9UUlVF KGEgPT0gYik7CisgICAgQVNTRVJUX0ZBTFNFKGEgIT0gYik7CisgICAgYSA9ICIiOworICAgIGIg PSBDU3RyaW5nKCk7CisgICAgQVNTRVJUX0ZBTFNFKGEgPT0gYik7CisgICAgQVNTRVJUX1RSVUUo YSAhPSBiKTsKKyAgICBhID0gImEiOworICAgIGIgPSAiIjsKKyAgICBBU1NFUlRfRkFMU0UoYSA9 PSBiKTsKKyAgICBBU1NFUlRfVFJVRShhICE9IGIpOworCisgICAgLy8gQ29tcGFyaXNvbiB3aXRo IGEgY29uc3QgY2hhciouCisgICAgQ1N0cmluZyBjOworICAgIGNvbnN0IGNoYXIqIGQgPSAwOwor ICAgIEFTU0VSVF9UUlVFKGMgPT0gZCk7CisgICAgQVNTRVJUX0ZBTFNFKGMgIT0gZCk7CisgICAg YyA9ICJjIjsKKyAgICBkID0gMDsKKyAgICBBU1NFUlRfRkFMU0UoYyA9PSBkKTsKKyAgICBBU1NF UlRfVFJVRShjICE9IGQpOworICAgIGMgPSBDU3RyaW5nKCk7CisgICAgZCA9ICJkIjsKKyAgICBB U1NFUlRfRkFMU0UoYyA9PSBkKTsKKyAgICBBU1NFUlRfVFJVRShjICE9IGQpOworICAgIGMgPSAi YyI7CisgICAgZCA9ICJkIjsKKyAgICBBU1NFUlRfRkFMU0UoYyA9PSBkKTsKKyAgICBBU1NFUlRf VFJVRShjICE9IGQpOworICAgIGMgPSAiYyI7CisgICAgZCA9ICJjIjsKKyAgICBBU1NFUlRfVFJV RShjID09IGQpOworICAgIEFTU0VSVF9GQUxTRShjICE9IGQpOworICAgIGMgPSAiYyI7CisgICAg ZCA9ICJjYyI7CisgICAgQVNTRVJUX0ZBTFNFKGMgPT0gZCk7CisgICAgQVNTRVJUX1RSVUUoYyAh PSBkKTsKKyAgICBjID0gImNjIjsKKyAgICBkID0gImMiOworICAgIEFTU0VSVF9GQUxTRShjID09 IGQpOworICAgIEFTU0VSVF9UUlVFKGMgIT0gZCk7CisgICAgYyA9ICIiOworICAgIGQgPSAiIjsK KyAgICBBU1NFUlRfVFJVRShjID09IGQpOworICAgIEFTU0VSVF9GQUxTRShjICE9IGQpOworICAg IGMgPSAiIjsKKyAgICBkID0gMDsKKyAgICBBU1NFUlRfRkFMU0UoYyA9PSBkKTsKKyAgICBBU1NF UlRfVFJVRShjICE9IGQpOworICAgIGMgPSBDU3RyaW5nKCk7CisgICAgZCA9ICIiOworICAgIEFT U0VSVF9GQUxTRShjID09IGQpOworICAgIEFTU0VSVF9UUlVFKGMgIT0gZCk7CisgICAgYyA9ICJh IjsKKyAgICBkID0gIiI7CisgICAgQVNTRVJUX0ZBTFNFKGMgPT0gZCk7CisgICAgQVNTRVJUX1RS VUUoYyAhPSBkKTsKKyAgICBjID0gIiI7CisgICAgZCA9ICJiIjsKKyAgICBBU1NFUlRfRkFMU0Uo YyA9PSBkKTsKKyAgICBBU1NFUlRfVFJVRShjICE9IGQpOworfQo=