96749 2012-09-14 03:45:40 -0700 WTFString::show doesn't dump non-ASCII characters in a readable manner 2012-09-18 10:57:14 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96873 1 glenn glenn ap benjamin darin seikwon.kim webkit.review.bot oldest_to_newest 720538 0 glenn 2012-09-14 03:45:40 -0700 To repeat: in debugger, invoke WTFString::show on a String that contains a non-ASCII character. That non-ASCII character is dumped as '?' which isn't useful for debugging. It should dump a reasonable ASCII representation instead, e.g., using the \uXXXX syntax. 720541 1 164093 glenn 2012-09-14 03:53:35 -0700 Created attachment 164093 Patch 720594 2 164093 glenn 2012-09-14 04:54:20 -0700 Comment on attachment 164093 Patch suggest benjaminp review 720900 3 164093 ap 2012-09-14 10:19:24 -0700 Comment on attachment 164093 Patch We have existing functionality for escaping strings in WebCore/platform/text/TextCodec.h and in window.escape function implementation. I suggest either reusing existing code, or at least keeping implementations close together. 721047 4 164093 benjamin 2012-09-14 12:48:33 -0700 Comment on attachment 164093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164093&action=review > Source/WTF/wtf/text/WTFString.cpp:1141 > - buffer.resize(length + 1); > - for (unsigned i = 0; i < length; ++i) { > + unsigned bufferNeeds = 1; > + for (unsigned i = 0; i < length; i++) { > UChar ch = characters[i]; > - buffer[i] = ch && (ch < 0x20 || ch > 0x7f) ? '?' : ch; > + bufferNeeds += !ch || ch < 0x20 || ch > 0x7f ? 6 : 1; > + } > + > + buffer.resize(bufferNeeds); > + unsigned bufferUsed = 0; The name bufferNeeds is not good enough, it poorly maps to the purpose of the variable. This is debug code, it should be simple to read. Drop the first loop, use Vector::append() instead of handling the size manually. Why would you change ++i to i++? > Source/WTF/wtf/text/WTFString.cpp:1143 > + UChar ch = characters[i]; I would drop impl->characters() before and use (*impl)[i] here. > Source/WTF/wtf/text/WTFString.cpp:1144 > + if (!ch || ch < 0x20 || ch > 0x7f) { We have isASCII() for that. > Source/WTF/wtf/text/WTFString.cpp:1150 > + for (unsigned k = 0; k < 4; k++, ch <<= 4) { > + static const char hexDigits[] = "0123456789ABCDEF"; > + buffer[bufferUsed++] = hexDigits[(ch >> 12) & 0xF]; > + } We have functions for that in HexNumbers.h 721282 5 glenn 2012-09-14 17:49:45 -0700 (In reply to comment #3) > (From update of attachment 164093 [details]) > We have existing functionality for escaping strings in WebCore/platform/text/TextCodec.h and in window.escape function implementation. I suggest either reusing existing code, or at least keeping implementations close together. understood, but perhaps WTF should not be dependent on WebCore? yes? 721290 6 benjamin 2012-09-14 18:05:50 -0700 > > We have existing functionality for escaping strings in WebCore/platform/text/TextCodec.h and in window.escape function implementation. I suggest either reusing existing code, or at least keeping implementations close together. > > understood, but perhaps WTF should not be dependent on WebCore? yes? That is not what Alexey suggested :) WTF should not depend on WebCore, but it is common for features to move from JavaScriptCore and WebCore to WTF. In this case, I am not entirely convinced it is necessary, but I haven't looked at TextCodec to see what can be done. 721325 7 164263 glenn 2012-09-14 19:18:01 -0700 Created attachment 164263 address comments in comment #4 721328 8 glenn 2012-09-14 19:21:50 -0700 (In reply to comment #6) > > > We have existing functionality for escaping strings in WebCore/platform/text/TextCodec.h and in window.escape function implementation. I suggest either reusing existing code, or at least keeping implementations close together. > > > > understood, but perhaps WTF should not be dependent on WebCore? yes? > > That is not what Alexey suggested :) > > WTF should not depend on WebCore, but it is common for features to move from JavaScriptCore and WebCore to WTF. > In this case, I am not entirely convinced it is necessary, but I haven't looked at TextCodec to see what can be done. in this present case, my goal is simply to have WTFString::show do something more sensible with !isASCIIPrintable UChars; might I suggest another BZ be filed if there is a desire to do more (such as move other related WebCore functions into WTFString et al.) 721367 9 benjamin 2012-09-14 21:05:20 -0700 > in this present case, my goal is simply to have WTFString::show do something more sensible with !isASCIIPrintable UChars; might I suggest another BZ be filed if there is a desire to do more (such as move other related WebCore functions into WTFString et al.) WebKit has a shared responsibility codebase. As such, if there is a better patch to be done, it should be done. Letting someone else clean after you is not a great option... I'll have a look at the patch. 721368 10 ap 2012-09-14 21:06:38 -0700 > In this case, I am not entirely convinced it is necessary, but I haven't looked at TextCodec to see what can be done. Ditto. Having code like this in three places surely feels wrong though. 721370 11 164263 benjamin 2012-09-14 21:11:47 -0700 Comment on attachment 164263 address comments in comment #4 Looks good. I don't think there is enough advantages to share the code with TextCodec. 721372 12 164263 webkit.review.bot 2012-09-14 21:38:53 -0700 Comment on attachment 164263 address comments in comment #4 Clearing flags on attachment: 164263 Committed r128682: <http://trac.webkit.org/changeset/128682> 721373 13 webkit.review.bot 2012-09-14 21:38:57 -0700 All reviewed patches have been landed. Closing bug. 721387 14 glenn 2012-09-14 23:31:50 -0700 (In reply to comment #9) > > in this present case, my goal is simply to have WTFString::show do something more sensible with !isASCIIPrintable UChars; might I suggest another BZ be filed if there is a desire to do more (such as move other related WebCore functions into WTFString et al.) > > WebKit has a shared responsibility codebase. As such, if there is a better patch to be done, it should be done. > Letting someone else clean after you is not a great option... > > I'll have a look at the patch. Understood. I'd be happy to work on "a better patch" or an additional patch if you or Alexey believe it is worth pursuing, in which case please give me a few hints of what you would like to see done. I agree one shouldn't leave around detritus to be cleaned up, and hope I'm not doing that here. Thanks for landing this one! 721391 15 mrowe 2012-09-15 00:01:30 -0700 This broke all of the Mac release builds, so I rolled it out in r128684. 721392 16 mrowe 2012-09-15 00:02:21 -0700 Example build log file is at <http://build.webkit.org/builders/Apple%20Lion%20Release%20%28Build%29/builds/3900/steps/compile-webkit/logs/stdio>. 721395 17 164277 glenn 2012-09-15 00:33:32 -0700 Created attachment 164277 fix release build 721400 18 164277 glenn 2012-09-15 01:08:58 -0700 Comment on attachment 164277 fix release build mea culpa; looks like HexNumber.h can't be included without a template expansion that references hexDigitsForMode(); this patch update fixes the Mac builds problem by conditionalizing the inclusion 721403 19 164277 benjamin 2012-09-15 01:22:06 -0700 Comment on attachment 164277 fix release build I would prefer HexNumber.h modified so that does not happen again. 721608 20 darin 2012-09-16 08:30:30 -0700 It’s not so great to dump in an ambiguous format. Probably need to change "\" into "\\" if we’re also going to use "\" as a metacharacter. 721677 21 glenn 2012-09-16 21:18:21 -0700 (In reply to comment #20) > It’s not so great to dump in an ambiguous format. Probably need to change "\" into "\\" if we’re also going to use "\" as a metacharacter. Good point (even though this is primarily intended for human reading, where it is unlikely to be mistaken). I'll make this fix and r? after someone lands the depends-on patch at [1]. [1] https://bugs.webkit.org/attachment.cgi?id=164304&action=review 722533 22 164502 glenn 2012-09-17 23:59:26 -0700 Created attachment 164502 address comment #20 722601 23 164502 glenn 2012-09-18 01:58:56 -0700 Comment on attachment 164502 address comment #20 all comments addressed, please review and land 722903 24 164502 webkit.review.bot 2012-09-18 10:57:10 -0700 Comment on attachment 164502 address comment #20 Clearing flags on attachment: 164502 Committed r128908: <http://trac.webkit.org/changeset/128908> 722904 25 webkit.review.bot 2012-09-18 10:57:14 -0700 All reviewed patches have been landed. Closing bug. 164093 2012-09-14 03:53:35 -0700 2012-09-14 19:17:58 -0700 Patch bug-96749-20120914185306.patch text/plain 2230 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDhiODcyOTVmODFkYTRlMmJjNWQ0MWVm ZjRhYTg3NjM5ZTM3ZDRkOTUuLjA3ODhhMDdlZWVmNGMxYmUxYTNjZTNkM2NjZWFhZDMzNGU5Y2Y2 NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDktMTQgIEdsZW5uIEFkYW1zICA8Z2xlbm5A c2t5bmF2LmNvbT4KKworICAgICAgICBXVEZTdHJpbmc6OnNob3cgZG9lc24ndCBkdW1wIG5vbi1B U0NJSSBjaGFyYWN0ZXJzIGluIGEgcmVhZGFibGUgbWFubmVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njc0OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1bXAgbm9uLUFTQ0lJIGNoYXJhY3RlcnMgaW4g YSB1c2VmdWwgZm9ybSBmb3IgZGVidWdnaW5nLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3Ry aW5nLmNwcDoKKyAgICAgICAgKGFzY2lpRGVidWcpOgorICAgICAgICBEdW1wIG5vbi1BU0NJSSBj aGFyYWN0ZXJzIChpLmUuLCBVVEYtMTYgY29kZSBlbGVtZW50cykgYXMgd2VsbCBhcyBub24tcHJp bnRhYmxlIEFTQ0lJIGNoYXJhY3RlcnMKKyAgICAgICAgdXNpbmcgXHVYWFhYIGZvcm1hdC4KKwog MjAxMi0wOS0xMyAgS2V2aW4gRnVuayAgPGtldmluLmZ1bmtAa2RhYi5jb20+CiAKICAgICAgICAg TWFrZSBjb21waWxlIHdpdGggYm90aCBPUyhXSU5DRSkgYW5kIFBMQVRGT1JNKFFUKSBzdXBwb3J0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAgYi9Tb3VyY2Uv V1RGL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAKaW5kZXggNmYxNGJjZjU2NGEyMGZkZDAyOGU1ZmYw YmZkMWYyYzE5YzI4NzgxNS4uZWQ3MjdlODg4Yjk0ZmZjZTg4ODgyMWU5NDg3Yjk4N2M1NmFjNzc0 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwCisrKyBiL1Nv dXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcApAQCAtMTEzMSwxMiArMTEzMSwyNyBAQCBW ZWN0b3I8Y2hhcj4gYXNjaWlEZWJ1ZyhTdHJpbmdJbXBsKiBpbXBsKQogICAgIHVuc2lnbmVkIGxl bmd0aCA9IGltcGwtPmxlbmd0aCgpOwogICAgIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzID0gaW1w bC0+Y2hhcmFjdGVycygpOwogCi0gICAgYnVmZmVyLnJlc2l6ZShsZW5ndGggKyAxKTsKLSAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKKyAgICB1bnNpZ25lZCBidWZm ZXJOZWVkcyA9IDE7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7 CiAgICAgICAgIFVDaGFyIGNoID0gY2hhcmFjdGVyc1tpXTsKLSAgICAgICAgYnVmZmVyW2ldID0g Y2ggJiYgKGNoIDwgMHgyMCB8fCBjaCA+IDB4N2YpID8gJz8nIDogY2g7CisgICAgICAgIGJ1ZmZl ck5lZWRzICs9ICFjaCB8fCBjaCA8IDB4MjAgfHwgY2ggPiAweDdmID8gNiA6IDE7CisgICAgfQor CisgICAgYnVmZmVyLnJlc2l6ZShidWZmZXJOZWVkcyk7CisgICAgdW5zaWduZWQgYnVmZmVyVXNl ZCA9IDA7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CisgICAg ICAgIFVDaGFyIGNoID0gY2hhcmFjdGVyc1tpXTsKKyAgICAgICAgaWYgKCFjaCB8fCBjaCA8IDB4 MjAgfHwgY2ggPiAweDdmKSB7CisgICAgICAgICAgICBidWZmZXJbYnVmZmVyVXNlZCsrXSA9ICdc XCc7CisgICAgICAgICAgICBidWZmZXJbYnVmZmVyVXNlZCsrXSA9ICd1JzsKKyAgICAgICAgICAg IGZvciAodW5zaWduZWQgayA9IDA7IGsgPCA0OyBrKyssIGNoIDw8PSA0KSB7CisgICAgICAgICAg ICAgICAgc3RhdGljIGNvbnN0IGNoYXIgaGV4RGlnaXRzW10gPSAiMDEyMzQ1Njc4OUFCQ0RFRiI7 CisgICAgICAgICAgICAgICAgYnVmZmVyW2J1ZmZlclVzZWQrK10gPSBoZXhEaWdpdHNbKGNoID4+ IDEyKSAmIDB4Rl07CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAg YnVmZmVyW2J1ZmZlclVzZWQrK10gPSBjaDsKICAgICB9Ci0gICAgYnVmZmVyW2xlbmd0aF0gPSAn XDAnOworICAgIGJ1ZmZlcltidWZmZXJVc2VkKytdID0gJ1wwJzsKIAogICAgIHJldHVybiBidWZm ZXI7CiB9Cg== 164263 2012-09-14 19:18:01 -0700 2012-09-15 00:33:27 -0700 address comments in comment #4 bug-96749-20120915101732.patch text/plain 2127 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4Njc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzODljNWRiNjlkYzBlZjg1ZGE2ZTc2 M2Y3MjA2ZTRhNjYzOGE0YWIuLmY1NDIzZGJlNDZjNGIxZWU5NTcxNjI5MjIzNzY1MGI3NTk4OTM3 YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDktMTQgIEdsZW5uIEFkYW1zICA8Z2xlbm5A c2t5bmF2LmNvbT4KKworICAgICAgICBXVEZTdHJpbmc6OnNob3cgZG9lc24ndCBkdW1wIG5vbi1B U0NJSSBjaGFyYWN0ZXJzIGluIGEgcmVhZGFibGUgbWFubmVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njc0OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1bXAgbm9uLUFTQ0lJIGNoYXJhY3RlcnMgaW4g YSB1c2VmdWwgZm9ybSBmb3IgZGVidWdnaW5nLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3Ry aW5nLmNwcDoKKyAgICAgICAgKGFzY2lpRGVidWcpOgorICAgICAgICBEdW1wIG5vbi1BU0NJSSBj aGFyYWN0ZXJzIChpLmUuLCBVVEYtMTYgY29kZSBlbGVtZW50cykgYXMgd2VsbCBhcyBub24tcHJp bnRhYmxlIEFTQ0lJIGNoYXJhY3RlcnMKKyAgICAgICAgdXNpbmcgXHVYWFhYIGZvcm1hdC4KKwog MjAxMi0wOS0xNCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAg ICBNaW5pbWl6ZSBjb2xsaXNpb25zIHdoZW4gaGFzaGluZyBwYWlycwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwIGIvU291cmNlL1dURi93dGYvdGV4dC9XVEZT dHJpbmcuY3BwCmluZGV4IGJmN2RiYzM0MWVmYTgyNjVhN2RiYzg2N2RlNDhkZGJjZWM3YjUzMTcu LjFkZTk1YmMwNmM1NjVmMTdiZTE0NDg0MjUzYWMxZjA1ODM4M2UxMDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0 L1dURlN0cmluZy5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlIDxzdGRhcmcuaD4KICNp bmNsdWRlIDx3dGYvQVNDSUlDVHlwZS5oPgogI2luY2x1ZGUgPHd0Zi9EYXRhTG9nLmg+CisjaW5j bHVkZSA8d3RmL0hleE51bWJlci5oPgogI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAjaW5j bHVkZSA8d3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NT dHJpbmcuaD4KQEAgLTExMzUsMTYgKzExMzYsMTcgQEAgVmVjdG9yPGNoYXI+IGFzY2lpRGVidWco U3RyaW5nSW1wbCogaW1wbCkKICAgICAgICAgcmV0dXJuIGFzY2lpRGVidWcoU3RyaW5nKCJbbnVs bF0iKS5pbXBsKCkpOwogCiAgICAgVmVjdG9yPGNoYXI+IGJ1ZmZlcjsKLSAgICB1bnNpZ25lZCBs ZW5ndGggPSBpbXBsLT5sZW5ndGgoKTsKLSAgICBjb25zdCBVQ2hhciogY2hhcmFjdGVycyA9IGlt cGwtPmNoYXJhY3RlcnMoKTsKLQotICAgIGJ1ZmZlci5yZXNpemUobGVuZ3RoICsgMSk7Ci0gICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7Ci0gICAgICAgIFVDaGFyIGNo ID0gY2hhcmFjdGVyc1tpXTsKLSAgICAgICAgYnVmZmVyW2ldID0gY2ggJiYgKGNoIDwgMHgyMCB8 fCBjaCA+IDB4N2YpID8gJz8nIDogY2g7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGlt cGwtPmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgVUNoYXIgY2ggPSAoKmltcGwpW2ldOworICAg ICAgICBpZiAoaXNBU0NJSVByaW50YWJsZShjaCkpCisgICAgICAgICAgICBidWZmZXIuYXBwZW5k KGNoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBidWZmZXIuYXBwZW5kKCdcXCcpOwor ICAgICAgICAgICAgYnVmZmVyLmFwcGVuZCgndScpOworICAgICAgICAgICAgYXBwZW5kVW5zaWdu ZWRBc0hleEZpeGVkU2l6ZShjaCwgYnVmZmVyLCA0KTsKKyAgICAgICAgfQogICAgIH0KLSAgICBi dWZmZXJbbGVuZ3RoXSA9ICdcMCc7Ci0KKyAgICBidWZmZXIuYXBwZW5kKCdcMCcpOwogICAgIHJl dHVybiBidWZmZXI7CiB9CiAK 164277 2012-09-15 00:33:32 -0700 2012-09-17 23:59:21 -0700 fix release build bug-96749-20120915153304.patch text/plain 2151 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4Njc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzODljNWRiNjlkYzBlZjg1ZGE2ZTc2 M2Y3MjA2ZTRhNjYzOGE0YWIuLmY1NDIzZGJlNDZjNGIxZWU5NTcxNjI5MjIzNzY1MGI3NTk4OTM3 YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDktMTQgIEdsZW5uIEFkYW1zICA8Z2xlbm5A c2t5bmF2LmNvbT4KKworICAgICAgICBXVEZTdHJpbmc6OnNob3cgZG9lc24ndCBkdW1wIG5vbi1B U0NJSSBjaGFyYWN0ZXJzIGluIGEgcmVhZGFibGUgbWFubmVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njc0OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1bXAgbm9uLUFTQ0lJIGNoYXJhY3RlcnMgaW4g YSB1c2VmdWwgZm9ybSBmb3IgZGVidWdnaW5nLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3Ry aW5nLmNwcDoKKyAgICAgICAgKGFzY2lpRGVidWcpOgorICAgICAgICBEdW1wIG5vbi1BU0NJSSBj aGFyYWN0ZXJzIChpLmUuLCBVVEYtMTYgY29kZSBlbGVtZW50cykgYXMgd2VsbCBhcyBub24tcHJp bnRhYmxlIEFTQ0lJIGNoYXJhY3RlcnMKKyAgICAgICAgdXNpbmcgXHVYWFhYIGZvcm1hdC4KKwog MjAxMi0wOS0xNCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAg ICBNaW5pbWl6ZSBjb2xsaXNpb25zIHdoZW4gaGFzaGluZyBwYWlycwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwIGIvU291cmNlL1dURi93dGYvdGV4dC9XVEZT dHJpbmcuY3BwCmluZGV4IGJmN2RiYzM0MWVmYTgyNjVhN2RiYzg2N2RlNDhkZGJjZWM3YjUzMTcu LjcxYjE1ZmJlOWQwZmI2OWYwOThiYTVhMDRlM2I4MWI3Y2Q4NjFjOGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0 L1dURlN0cmluZy5jcHAKQEAgLTI2LDYgKzI2LDkgQEAKICNpbmNsdWRlIDxzdGRhcmcuaD4KICNp bmNsdWRlIDx3dGYvQVNDSUlDVHlwZS5oPgogI2luY2x1ZGUgPHd0Zi9EYXRhTG9nLmg+CisjaWZu ZGVmIE5ERUJVRworI2luY2x1ZGUgPHd0Zi9IZXhOdW1iZXIuaD4KKyNlbmRpZgogI2luY2x1ZGUg PHd0Zi9NYXRoRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTExMzUsMTYgKzExMzgsMTcgQEAg VmVjdG9yPGNoYXI+IGFzY2lpRGVidWcoU3RyaW5nSW1wbCogaW1wbCkKICAgICAgICAgcmV0dXJu IGFzY2lpRGVidWcoU3RyaW5nKCJbbnVsbF0iKS5pbXBsKCkpOwogCiAgICAgVmVjdG9yPGNoYXI+ IGJ1ZmZlcjsKLSAgICB1bnNpZ25lZCBsZW5ndGggPSBpbXBsLT5sZW5ndGgoKTsKLSAgICBjb25z dCBVQ2hhciogY2hhcmFjdGVycyA9IGltcGwtPmNoYXJhY3RlcnMoKTsKLQotICAgIGJ1ZmZlci5y ZXNpemUobGVuZ3RoICsgMSk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsg KytpKSB7Ci0gICAgICAgIFVDaGFyIGNoID0gY2hhcmFjdGVyc1tpXTsKLSAgICAgICAgYnVmZmVy W2ldID0gY2ggJiYgKGNoIDwgMHgyMCB8fCBjaCA+IDB4N2YpID8gJz8nIDogY2g7CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGltcGwtPmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgVUNo YXIgY2ggPSAoKmltcGwpW2ldOworICAgICAgICBpZiAoaXNBU0NJSVByaW50YWJsZShjaCkpCisg ICAgICAgICAgICBidWZmZXIuYXBwZW5kKGNoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAg ICBidWZmZXIuYXBwZW5kKCdcXCcpOworICAgICAgICAgICAgYnVmZmVyLmFwcGVuZCgndScpOwor ICAgICAgICAgICAgYXBwZW5kVW5zaWduZWRBc0hleEZpeGVkU2l6ZShjaCwgYnVmZmVyLCA0KTsK KyAgICAgICAgfQogICAgIH0KLSAgICBidWZmZXJbbGVuZ3RoXSA9ICdcMCc7Ci0KKyAgICBidWZm ZXIuYXBwZW5kKCdcMCcpOwogICAgIHJldHVybiBidWZmZXI7CiB9CiAK 164502 2012-09-17 23:59:26 -0700 2012-09-18 10:57:10 -0700 address comment #20 bug-96749-20120918145854.patch text/plain 2332 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4ODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDA4MzZjOGU1YzVmYTZlYmVhMmRkYjZl MzM1ZmU5NmU3YThkODgzNGUuLjI0OTJkNWYzNjhiNDExN2UxNDkxYTI2NmFmMGNjZjJlMWRmMzlm MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTItMDktMTcgIEdsZW5uIEFkYW1zICA8Z2xlbm5A c2t5bmF2LmNvbT4KIAorICAgICAgICBXVEZTdHJpbmc6OnNob3cgZG9lc24ndCBkdW1wIG5vbi1B U0NJSSBjaGFyYWN0ZXJzIGluIGEgcmVhZGFibGUgbWFubmVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njc0OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1bXAgbm9uLUFTQ0lJIGNoYXJhY3RlcnMgaW4g YSB1c2VmdWwgZm9ybSBmb3IgZGVidWdnaW5nLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3Ry aW5nLmNwcDoKKyAgICAgICAgKGFzY2lpRGVidWcpOgorICAgICAgICBEdW1wIG5vbi1BU0NJSSBj aGFyYWN0ZXJzIChpLmUuLCBVVEYtMTYgY29kZSBlbGVtZW50cykgYXMgd2VsbCBhcyBub24tcHJp bnRhYmxlIEFTQ0lJIGNoYXJhY3RlcnMKKyAgICAgICAgdXNpbmcgXHVYWFhYIGZvcm1hdC4gQWxz byBlc2NhcGUgXCBhcyBcXCBpbiBvcmRlciB0byByZW1vdmUgYW1iaWd1aXR5LgorCisyMDEyLTA5 LTE3ICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CisKICAgICAgICAgSW5jbHVkaW5n IEhleE51bWJlci5oIGZhaWxzIGJ1aWxkIGlmIGhleERpZ2l0c0Zvck1vZGUgaXMgbm90IHJlZmVy ZW5jZWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2 ODczCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcCBiL1Nv dXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcAppbmRleCBiODlhY2I2NjM5ZjExZTUyZGQy YWRhMWUyMzkyNWE1ZjcwY2ZhZTE4Li45ZjczOWM5MWI3NjU3ZGJhNDNjZGYxMzM5MjAzOTRjYWEx NGY0OWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAKKysr IGIvU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAj aW5jbHVkZSA8c3RkYXJnLmg+CiAjaW5jbHVkZSA8d3RmL0FTQ0lJQ1R5cGUuaD4KICNpbmNsdWRl IDx3dGYvRGF0YUxvZy5oPgorI2luY2x1ZGUgPHd0Zi9IZXhOdW1iZXIuaD4KICNpbmNsdWRlIDx3 dGYvTWF0aEV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaD4K ICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC0xMTM1LDE2ICsxMTM2LDE5IEBAIFZl Y3RvcjxjaGFyPiBhc2NpaURlYnVnKFN0cmluZ0ltcGwqIGltcGwpCiAgICAgICAgIHJldHVybiBh c2NpaURlYnVnKFN0cmluZygiW251bGxdIikuaW1wbCgpKTsKIAogICAgIFZlY3RvcjxjaGFyPiBi dWZmZXI7Ci0gICAgdW5zaWduZWQgbGVuZ3RoID0gaW1wbC0+bGVuZ3RoKCk7Ci0gICAgY29uc3Qg VUNoYXIqIGNoYXJhY3RlcnMgPSBpbXBsLT5jaGFyYWN0ZXJzKCk7Ci0KLSAgICBidWZmZXIucmVz aXplKGxlbmd0aCArIDEpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsr aSkgewotICAgICAgICBVQ2hhciBjaCA9IGNoYXJhY3RlcnNbaV07Ci0gICAgICAgIGJ1ZmZlcltp XSA9IGNoICYmIChjaCA8IDB4MjAgfHwgY2ggPiAweDdmKSA/ICc/JyA6IGNoOworICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBpbXBsLT5sZW5ndGgoKTsgKytpKSB7CisgICAgICAgIFVDaGFy IGNoID0gKCppbXBsKVtpXTsKKyAgICAgICAgaWYgKGlzQVNDSUlQcmludGFibGUoY2gpKSB7Cisg ICAgICAgICAgICBpZiAoY2ggPT0gJ1xcJykKKyAgICAgICAgICAgICAgICBidWZmZXIuYXBwZW5k KGNoKTsKKyAgICAgICAgICAgIGJ1ZmZlci5hcHBlbmQoY2gpOworICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgYnVmZmVyLmFwcGVuZCgnXFwnKTsKKyAgICAgICAgICAgIGJ1ZmZlci5hcHBl bmQoJ3UnKTsKKyAgICAgICAgICAgIGFwcGVuZFVuc2lnbmVkQXNIZXhGaXhlZFNpemUoY2gsIGJ1 ZmZlciwgNCk7CisgICAgICAgIH0KICAgICB9Ci0gICAgYnVmZmVyW2xlbmd0aF0gPSAnXDAnOwot CisgICAgYnVmZmVyLmFwcGVuZCgnXDAnKTsKICAgICByZXR1cm4gYnVmZmVyOwogfQogCg==