194272 2019-02-04 19:48:00 -0800 URLHelpers should use unorm2_quickCheck before converting to NFC 2019-03-04 07:18:50 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro ap benjamin bugs-noreply cdumez cmarcelo commit-queue darin dbates ews-watchlist mcatanzaro oldest_to_newest 1502227 0 mcatanzaro 2019-02-04 19:48:00 -0800 Bug #174816 turned gargantuan so I'll use a new bug to address these follow-ups: > Any tests we're adding to the cross-platform test should be removed from the > platform-specific test. Ideally the entire test would become cross-platform, > but I see that would require a bit more work and we're just days away from > API freeze, so I understand if that can't happen now. > > This is minor, but Darin did request that we not use > charactersWithNullTermination if we are just going to cut off the null > termination right away. His suggested idiom was: > > auto characters = StringView { string }.upconvertedCharacters(); > > Were there any troubles with that? > > Then the unorm2_quickCheck should be one extra function call towards the top > of toNormalizationFormC(), just to avoid calling unorm2_normalize() if it's > not really needed. That could be done in a follow-up, of course, but it > seems easy? 1507961 1 mcatanzaro 2019-02-19 18:55:23 -0800 Might be able to share code with FontCairoHarfbuzzNG.cpp. 1509412 2 mcatanzaro 2019-02-23 16:34:20 -0800 (In reply to Michael Catanzaro from comment #0) > > This is minor, but Darin did request that we not use > > charactersWithNullTermination if we are just going to cut off the null > > termination right away. His suggested idiom was: > > > > auto characters = StringView { string }.upconvertedCharacters(); > > > > Were there any troubles with that? Not happy with the gymnastics required to keep length separately: auto characters = StringView { string }.upconvertedCharacters(); const UChar* sourceBuffer = characters.get(); auto length = string.length(); The code is more clear when we just have a Vector<UChar>, like currently. 1509413 3 mcatanzaro 2019-02-23 16:34:50 -0800 (In reply to Michael Catanzaro from comment #1) > Might be able to share code with FontCairoHarfbuzzNG.cpp. It's used in so many other places. That should be left for a different bug. 1509414 4 mcatanzaro 2019-02-23 16:45:13 -0800 (In reply to Michael Catanzaro from comment #0) > Bug #174816 turned gargantuan so I'll use a new bug to address these > follow-ups: > > > Any tests we're adding to the cross-platform test should be removed from the > > platform-specific test. Ideally the entire test would become cross-platform, > > but I see that would require a bit more work and we're just days away from > > API freeze, so I understand if that can't happen now I'm going to punt on this too since the Cocoa test relies on some APIs that we don't plan to make cross-platform. 1509415 5 362841 mcatanzaro 2019-02-23 16:56:13 -0800 Created attachment 362841 Patch 1511924 6 362841 darin 2019-03-03 00:37:32 -0800 Comment on attachment 362841 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362841&action=review This seems OK as is, but I think there is room for improvement. > Source/WTF/wtf/URLHelpers.cpp:778 > - auto sourceBuffer = string.charactersWithNullTermination(); > + Vector<UChar> sourceBuffer = string.charactersWithNullTermination(); I guess you don’t like auto in a case like this. I do; keeps the code less wordy. I don’t understand why we need the null termination. I think unorm2_quickCheck can work on characters in place; charactersWithNullTermination is an expensive operation that should be avoided if possible. > Source/WTF/wtf/URLHelpers.cpp:783 > + const UNormalizer2* normalizer = unorm2_getNFCInstance(&uerror); I prefer auto to writing out const UNormalizer2*, but I suppose tastes differ. > Source/WTF/wtf/URLHelpers.cpp:787 > + UNormalizationCheckResult checkResult = unorm2_quickCheck(normalizer, sourceBuffer.data(), sourceBuffer.size(), &uerror); I prefer auto to writing out UNormalizationCheckResult, but I suppose tastes differ. > Source/WTF/wtf/URLHelpers.cpp:793 > + return String(sourceBuffer.data(), sourceBuffer.size()); Better performance if this does: return string; Then we share the StringImpl instead of allocating a new one with the same characters in it. > Source/WTF/wtf/URLHelpers.cpp:798 > + uerror = U_ZERO_ERROR; Is this needed? If there was an error, we would have returned, I think. > Source/WTF/wtf/URLHelpers.cpp:799 > + if (U_SUCCESS(uerror)) { This is strange. It checks the value of something we set the line before. I think we instead want to remove this if statement. 1511925 7 darin 2019-03-03 00:39:33 -0800 (In reply to Michael Catanzaro from comment #2) > Not happy with the gymnastics required to keep length separately: > > auto characters = StringView { string }.upconvertedCharacters(); > const UChar* sourceBuffer = characters.get(); > auto length = string.length(); > > The code is more clear when we just have a Vector<UChar>, like currently. I’ll come back and do the optimization. Because that clarity comes at a real cost. The upconvertedCharacters() function is free when the string already is stored as UChar, whereas the Vector thing means copying all the characters into a newly allocated memory buffer! Might also want a fast case for LChar strings to avoid upconverting them. All depends on how often this function is used. A high quality implementation for extensive re-use should probably eventually have these optimizations. 1511951 8 mcatanzaro 2019-03-03 11:25:21 -0800 (In reply to Darin Adler from comment #6) > > Source/WTF/wtf/URLHelpers.cpp:778 > > - auto sourceBuffer = string.charactersWithNullTermination(); > > + Vector<UChar> sourceBuffer = string.charactersWithNullTermination(); > > I guess you don’t like auto in a case like this. I do; keeps the code less > wordy. I think we don't have guidelines on this. My rule of thumb is: is the code easier to read with auto? Less-wordy code is usually easier to read, but sometimes it's more important to be able to see the type at a glance without having to open WTFString.h and search for "charactersWithNullTermination," which is what I probably had to do here to figure out what type I was working with. It's important that this is a Vector and that it's a vector of UChar, not a char* or whatever. So I usually find myself using auto more for (a) integer types, (b) really long types, or (c) when the type is obvious, e.g. when there is a cast on the rhs of an assignment. > I don’t understand why we need the null termination. I think > unorm2_quickCheck can work on characters in place; > charactersWithNullTermination is an expensive operation that should be > avoided if possible. We don't need the null termination. String just doesn't provide a function to get a Vector<UChar> without the null termination. > > Source/WTF/wtf/URLHelpers.cpp:783 > > + const UNormalizer2* normalizer = unorm2_getNFCInstance(&uerror); > > I prefer auto to writing out const UNormalizer2*, but I suppose tastes > differ. I wish we had stronger guidelines so I didn't have to think about this whenever declaring variables. Here, I could go either way. You're probably not going to be able to modify this code without looking at the ICU API reference, so having the type written out seems much less important here than in the example above. But I don't see much advantage of using auto here, either. I think we normally also write out const auto* in WebKit to avoid hiding those modifiers, even though they're not necessary. (Especially the * is important for readability.) > > Source/WTF/wtf/URLHelpers.cpp:793 > > + return String(sourceBuffer.data(), sourceBuffer.size()); > > Better performance if this does: > > return string; > > Then we share the StringImpl instead of allocating a new one with the same > characters in it. Oh, right. Let me fix this.... > > Source/WTF/wtf/URLHelpers.cpp:798 > > + uerror = U_ZERO_ERROR; > > Is this needed? If there was an error, we would have returned, I think. > > > Source/WTF/wtf/URLHelpers.cpp:799 > > + if (U_SUCCESS(uerror)) { > > This is strange. It checks the value of something we set the line before. I > think we instead want to remove this if statement. That's just a refactoring bug. Oops. Will fix this too. I'll let you handle optimizing it by using upconvertedCharacters(), and convert to auto if you wish. 1511957 9 363462 mcatanzaro 2019-03-03 11:45:50 -0800 Created attachment 363462 Patch 1511959 10 mcatanzaro 2019-03-03 11:46:36 -0800 And I removed the inadvertently-committed test file in r242329. I wish I had more time to work on making the URLExtras.mm test cross-platform, but I don't right now, sorry. 1511966 11 darin 2019-03-03 11:59:46 -0800 (In reply to Michael Catanzaro from comment #8) > I'll let you handle optimizing it by using upconvertedCharacters() Might do that. Especially if we add enough tests that it’s easy for me to know I didn’t break it. > and convert to auto Definitely won’t do that! 1512147 12 mcatanzaro 2019-03-04 06:53:23 -0800 There are already tons of tests in URLExtras.mm, I just wish they were cross-platform. :( 1512153 13 363462 commit-queue 2019-03-04 07:18:48 -0800 Comment on attachment 363462 Patch Clearing flags on attachment: 363462 Committed r242353: <https://trac.webkit.org/changeset/242353> 1512154 14 commit-queue 2019-03-04 07:18:50 -0800 All reviewed patches have been landed. Closing bug. 362841 2019-02-23 16:56:13 -0800 2019-03-03 11:45:48 -0800 Patch bug-194272-20190223185613.patch text/plain 2863 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxOTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZiM2MzMzM3MjE4MGVmZDgxNmM4YzY3 MGFiOWQzNjBlMGJlYzcwMDkuLmNhNjVmZGRlZDVhODZlNjgyYWNlMWE5ZGY5ZTc5YjQ2OGNmYmI4 YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDItMjMgIE1pY2hhZWwgQ2F0YW56YXJvICA8 bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFVSTEhlbHBlcnMgc2hvdWxkIHVzZSB1 bm9ybTJfcXVpY2tDaGVjayBiZWZvcmUgY29udmVydGluZyB0byBORkMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDI3MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHRoZSBzdHJpbmcgaXMgYWxyZWFk eSBpbiBub3JtYWxpemF0aW9uIGZvcm0gQywgZG9uJ3QgdHJ5IHRvIG5vcm1hbGl6ZSBpdC4KKwor ICAgICAgICAqIHd0Zi9VUkxIZWxwZXJzLmNwcDoKKyAgICAgICAgKFdURjo6VVJMSGVscGVyczo6 dG9Ob3JtYWxpemF0aW9uRm9ybUMpOgorCiAyMDE5LTAyLTIzICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYW4gZXhjZXB0aW9uIGNoZWNrIGFuZCBzb21lIGFz c2VydGlvbnMgaW4gU3RyaW5nUHJvdG90eXBlLmNwcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYv d3RmL1VSTEhlbHBlcnMuY3BwIGIvU291cmNlL1dURi93dGYvVVJMSGVscGVycy5jcHAKaW5kZXgg YzY5Y2EzODIxMjhhYWRmNDQ4YjhhYzNkMzk1M2ZhZjk1ZDYxNDZkZC4uNTk0OGNiOWE0MTU3ZTkw MGMxOGNlZjNlY2U4NTAxNWEzYWI0OTEyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvVVJM SGVscGVycy5jcHAKKysrIGIvU291cmNlL1dURi93dGYvVVJMSGVscGVycy5jcHAKQEAgLTc3NSwy MyArNzc1LDM1IEBAIHN0YXRpYyBTdHJpbmcgY3JlYXRlU3RyaW5nV2l0aEVzY2FwZWRVbnNhZmVD aGFyYWN0ZXJzKGNvbnN0IFN0cmluZyYgc291cmNlQnVmZmVyCiAKIHN0YXRpYyBTdHJpbmcgdG9O b3JtYWxpemF0aW9uRm9ybUMoY29uc3QgU3RyaW5nJiBzdHJpbmcpCiB7Ci0gICAgYXV0byBzb3Vy Y2VCdWZmZXIgPSBzdHJpbmcuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKTsKKyAgICBW ZWN0b3I8VUNoYXI+IHNvdXJjZUJ1ZmZlciA9IHN0cmluZy5jaGFyYWN0ZXJzV2l0aE51bGxUZXJt aW5hdGlvbigpOwogICAgIEFTU0VSVChzb3VyY2VCdWZmZXIubGFzdCgpID09ICdcMCcpOwogICAg IHNvdXJjZUJ1ZmZlci5yZW1vdmVMYXN0KCk7CiAKKyAgICBVRXJyb3JDb2RlIHVlcnJvciA9IFVf WkVST19FUlJPUjsKKyAgICBjb25zdCBVTm9ybWFsaXplcjIqIG5vcm1hbGl6ZXIgPSB1bm9ybTJf Z2V0TkZDSW5zdGFuY2UoJnVlcnJvcik7CisgICAgaWYgKFVfRkFJTFVSRSh1ZXJyb3IpKQorICAg ICAgICByZXR1cm4geyB9OworCisgICAgVU5vcm1hbGl6YXRpb25DaGVja1Jlc3VsdCBjaGVja1Jl c3VsdCA9IHVub3JtMl9xdWlja0NoZWNrKG5vcm1hbGl6ZXIsIHNvdXJjZUJ1ZmZlci5kYXRhKCks IHNvdXJjZUJ1ZmZlci5zaXplKCksICZ1ZXJyb3IpOworICAgIGlmIChVX0ZBSUxVUkUodWVycm9y KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIC8vIE5vIG5lZWQgdG8gbm9ybWFsaXplIGlm IGFscmVhZHkgbm9ybWFsaXplZC4KKyAgICBpZiAoY2hlY2tSZXN1bHQgPT0gVU5PUk1fWUVTKQor ICAgICAgICByZXR1cm4gU3RyaW5nKHNvdXJjZUJ1ZmZlci5kYXRhKCksIHNvdXJjZUJ1ZmZlci5z aXplKCkpOworCiAgICAgU3RyaW5nIHJlc3VsdDsKICAgICBWZWN0b3I8VUNoYXIsIHVybEJ5dGVz QnVmZmVyTGVuZ3RoPiBub3JtYWxpemVkQ2hhcmFjdGVycyhzb3VyY2VCdWZmZXIuc2l6ZSgpKTsK LSAgICBVRXJyb3JDb2RlIHVlcnJvciA9IFVfWkVST19FUlJPUjsKICAgICBpbnQzMl90IG5vcm1h bGl6ZWRMZW5ndGggPSAwOwotICAgIGNvbnN0IFVOb3JtYWxpemVyMiogbm9ybWFsaXplciA9IHVu b3JtMl9nZXRORkNJbnN0YW5jZSgmdWVycm9yKTsKLSAgICBpZiAoIVVfRkFJTFVSRSh1ZXJyb3Ip KSB7CisgICAgdWVycm9yID0gVV9aRVJPX0VSUk9SOworICAgIGlmIChVX1NVQ0NFU1ModWVycm9y KSkgewogICAgICAgICBub3JtYWxpemVkTGVuZ3RoID0gdW5vcm0yX25vcm1hbGl6ZShub3JtYWxp emVyLCBzb3VyY2VCdWZmZXIuZGF0YSgpLCBzb3VyY2VCdWZmZXIuc2l6ZSgpLCBub3JtYWxpemVk Q2hhcmFjdGVycy5kYXRhKCksIG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLnNpemUoKSwgJnVlcnJvcik7 CiAgICAgICAgIGlmICh1ZXJyb3IgPT0gVV9CVUZGRVJfT1ZFUkZMT1dfRVJST1IpIHsKICAgICAg ICAgICAgIHVlcnJvciA9IFVfWkVST19FUlJPUjsKICAgICAgICAgICAgIG5vcm1hbGl6ZWRDaGFy YWN0ZXJzLnJlc2l6ZShub3JtYWxpemVkTGVuZ3RoKTsKICAgICAgICAgICAgIG5vcm1hbGl6ZWRM ZW5ndGggPSB1bm9ybTJfbm9ybWFsaXplKG5vcm1hbGl6ZXIsIHNvdXJjZUJ1ZmZlci5kYXRhKCks IHNvdXJjZUJ1ZmZlci5zaXplKCksIG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLmRhdGEoKSwgbm9ybWFs aXplZExlbmd0aCwgJnVlcnJvcik7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCFVX0ZBSUxVUkUo dWVycm9yKSkKKyAgICAgICAgaWYgKFVfU1VDQ0VTUyh1ZXJyb3IpKQogICAgICAgICAgICAgcmVz dWx0ID0gU3RyaW5nKG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLmRhdGEoKSwgbm9ybWFsaXplZExlbmd0 aCk7CiAgICAgfQogCg== 363462 2019-03-03 11:45:50 -0800 2019-03-04 07:18:48 -0800 Patch bug-194272-20190303134549.patch text/plain 3371 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIzMWEzYjdkMWFlYTMxOGQ0MzE1ZDJm YTRhNTEzOGIzNzZjMzQ5ZTQuLjEwODMzNjNjMzZmMGVhZTIzN2Q4MTExNTgyZWIxMjJhNzk5OGZk MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDMtMDMgIE1pY2hhZWwgQ2F0YW56YXJvICA8 bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFVSTEhlbHBlcnMgc2hvdWxkIHVzZSB1 bm9ybTJfcXVpY2tDaGVjayBiZWZvcmUgY29udmVydGluZyB0byBORkMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDI3MgorCisgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIElmIHRoZSBzdHJpbmcgaXMgYWxyZWFkeSBp biBub3JtYWxpemF0aW9uIGZvcm0gQywgZG9uJ3QgdHJ5IHRvIG5vcm1hbGl6ZSBpdC4KKworICAg ICAgICAqIHd0Zi9VUkxIZWxwZXJzLmNwcDoKKyAgICAgICAgKFdURjo6VVJMSGVscGVyczo6dG9O b3JtYWxpemF0aW9uRm9ybUMpOgorCiAyMDE5LTAyLTI3ICBEYXJpbiBBZGxlciAgPGRhcmluQGFw cGxlLmNvbT4KIAogICAgICAgICBGaXhlZCBtYWtlU3RyaW5nKGZsb2F0KSB0byBkbyBzaG9ydGVz dC1mb3JtIHNlcmlhbGl6YXRpb24gd2l0aG91dCBmaXJzdCBjb252ZXJ0aW5nIHRvIGRvdWJsZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvVVJMSGVscGVycy5jcHAgYi9Tb3VyY2UvV1RGL3d0 Zi9VUkxIZWxwZXJzLmNwcAppbmRleCA0ZmIyODdhMmFlYTRmNjVhYmM0MjFlNGIwNWRjYjU4YjZi OTM0NTk3Li5jOTQzZTMzYmEzNDY5MzAzMzU0MTY1MmRhNmNmMmE2ZmRlY2QyNGQ4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9VUkxIZWxwZXJzLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9V UkxIZWxwZXJzLmNwcApAQCAtNzc1LDI3ICs3NzUsMzQgQEAgc3RhdGljIFN0cmluZyBjcmVhdGVT dHJpbmdXaXRoRXNjYXBlZFVuc2FmZUNoYXJhY3RlcnMoY29uc3QgU3RyaW5nJiBzb3VyY2VCdWZm ZXIKIAogc3RhdGljIFN0cmluZyB0b05vcm1hbGl6YXRpb25Gb3JtQyhjb25zdCBTdHJpbmcmIHN0 cmluZykKIHsKLSAgICBhdXRvIHNvdXJjZUJ1ZmZlciA9IHN0cmluZy5jaGFyYWN0ZXJzV2l0aE51 bGxUZXJtaW5hdGlvbigpOworICAgIFZlY3RvcjxVQ2hhcj4gc291cmNlQnVmZmVyID0gc3RyaW5n LmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCk7CiAgICAgQVNTRVJUKHNvdXJjZUJ1ZmZl ci5sYXN0KCkgPT0gJ1wwJyk7CiAgICAgc291cmNlQnVmZmVyLnJlbW92ZUxhc3QoKTsKIAotICAg IFN0cmluZyByZXN1bHQ7Ci0gICAgVmVjdG9yPFVDaGFyLCB1cmxCeXRlc0J1ZmZlckxlbmd0aD4g bm9ybWFsaXplZENoYXJhY3RlcnMoc291cmNlQnVmZmVyLnNpemUoKSk7CiAgICAgVUVycm9yQ29k ZSB1ZXJyb3IgPSBVX1pFUk9fRVJST1I7Ci0gICAgaW50MzJfdCBub3JtYWxpemVkTGVuZ3RoID0g MDsKICAgICBjb25zdCBVTm9ybWFsaXplcjIqIG5vcm1hbGl6ZXIgPSB1bm9ybTJfZ2V0TkZDSW5z dGFuY2UoJnVlcnJvcik7Ci0gICAgaWYgKCFVX0ZBSUxVUkUodWVycm9yKSkgewotICAgICAgICBu b3JtYWxpemVkTGVuZ3RoID0gdW5vcm0yX25vcm1hbGl6ZShub3JtYWxpemVyLCBzb3VyY2VCdWZm ZXIuZGF0YSgpLCBzb3VyY2VCdWZmZXIuc2l6ZSgpLCBub3JtYWxpemVkQ2hhcmFjdGVycy5kYXRh KCksIG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLnNpemUoKSwgJnVlcnJvcik7Ci0gICAgICAgIGlmICh1 ZXJyb3IgPT0gVV9CVUZGRVJfT1ZFUkZMT1dfRVJST1IpIHsKLSAgICAgICAgICAgIHVlcnJvciA9 IFVfWkVST19FUlJPUjsKLSAgICAgICAgICAgIG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLnJlc2l6ZShu b3JtYWxpemVkTGVuZ3RoKTsKLSAgICAgICAgICAgIG5vcm1hbGl6ZWRMZW5ndGggPSB1bm9ybTJf bm9ybWFsaXplKG5vcm1hbGl6ZXIsIHNvdXJjZUJ1ZmZlci5kYXRhKCksIHNvdXJjZUJ1ZmZlci5z aXplKCksIG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLmRhdGEoKSwgbm9ybWFsaXplZExlbmd0aCwgJnVl cnJvcik7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCFVX0ZBSUxVUkUodWVycm9yKSkKLSAgICAg ICAgICAgIHJlc3VsdCA9IFN0cmluZyhub3JtYWxpemVkQ2hhcmFjdGVycy5kYXRhKCksIG5vcm1h bGl6ZWRMZW5ndGgpOworICAgIGlmIChVX0ZBSUxVUkUodWVycm9yKSkKKyAgICAgICAgcmV0dXJu IHsgfTsKKworICAgIFVOb3JtYWxpemF0aW9uQ2hlY2tSZXN1bHQgY2hlY2tSZXN1bHQgPSB1bm9y bTJfcXVpY2tDaGVjayhub3JtYWxpemVyLCBzb3VyY2VCdWZmZXIuZGF0YSgpLCBzb3VyY2VCdWZm ZXIuc2l6ZSgpLCAmdWVycm9yKTsKKyAgICBpZiAoVV9GQUlMVVJFKHVlcnJvcikpCisgICAgICAg IHJldHVybiB7IH07CisKKyAgICAvLyBObyBuZWVkIHRvIG5vcm1hbGl6ZSBpZiBhbHJlYWR5IG5v cm1hbGl6ZWQuCisgICAgaWYgKGNoZWNrUmVzdWx0ID09IFVOT1JNX1lFUykKKyAgICAgICAgcmV0 dXJuIHN0cmluZzsKKworICAgIFZlY3RvcjxVQ2hhciwgdXJsQnl0ZXNCdWZmZXJMZW5ndGg+IG5v cm1hbGl6ZWRDaGFyYWN0ZXJzKHNvdXJjZUJ1ZmZlci5zaXplKCkpOworICAgIGF1dG8gbm9ybWFs aXplZExlbmd0aCA9IHVub3JtMl9ub3JtYWxpemUobm9ybWFsaXplciwgc291cmNlQnVmZmVyLmRh dGEoKSwgc291cmNlQnVmZmVyLnNpemUoKSwgbm9ybWFsaXplZENoYXJhY3RlcnMuZGF0YSgpLCBu b3JtYWxpemVkQ2hhcmFjdGVycy5zaXplKCksICZ1ZXJyb3IpOworICAgIGlmICh1ZXJyb3IgPT0g VV9CVUZGRVJfT1ZFUkZMT1dfRVJST1IpIHsKKyAgICAgICAgdWVycm9yID0gVV9aRVJPX0VSUk9S OworICAgICAgICBub3JtYWxpemVkQ2hhcmFjdGVycy5yZXNpemUobm9ybWFsaXplZExlbmd0aCk7 CisgICAgICAgIG5vcm1hbGl6ZWRMZW5ndGggPSB1bm9ybTJfbm9ybWFsaXplKG5vcm1hbGl6ZXIs IHNvdXJjZUJ1ZmZlci5kYXRhKCksIHNvdXJjZUJ1ZmZlci5zaXplKCksIG5vcm1hbGl6ZWRDaGFy YWN0ZXJzLmRhdGEoKSwgbm9ybWFsaXplZExlbmd0aCwgJnVlcnJvcik7CiAgICAgfQorICAgIGlm IChVX0ZBSUxVUkUodWVycm9yKSkKKyAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiBy ZXN1bHQ7CisgICAgcmV0dXJuIFN0cmluZyhub3JtYWxpemVkQ2hhcmFjdGVycy5kYXRhKCksIG5v cm1hbGl6ZWRMZW5ndGgpOwogfQogCiBTdHJpbmcgdXNlclZpc2libGVVUkwoY29uc3QgQ1N0cmlu ZyYgdXJsKQo=