88936 2012-06-12 16:43:55 -0700 StringImpl::characters can return NULL for an empty string 2012-08-26 01:13:40 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified UNCONFIRMED P2 Normal --- 0 litherum litherum ap benjamin webkit.review.bot oldest_to_newest 647473 0 litherum 2012-06-12 16:43:55 -0700 StringImpl::characters can return NULL for an empty string 647475 1 147191 litherum 2012-06-12 16:45:59 -0700 Created attachment 147191 Patch 647481 2 litherum 2012-06-12 16:50:29 -0700 This is pretty hacky, but I'm not sure I can think of a better way. Callers of characters() shouldn't be free()ing the pointer, so this should be relatively safe. One alternative would be to assign a non-NULL value to the m_copyData16 variable, and check for it on destruction, but I think this is a little cleaner. Another alternative would be to add a "is-valid" byte to each string, but the overhead of an extra byte to each string is probably not worth it. If a reviewer can think of a less-hacky way to handle this, I'd be happy to do that instead. 648241 3 ap 2012-06-13 10:46:32 -0700 The bug says that the function can return NULL, but not why it should. Can you explain that? 648356 4 litherum 2012-06-13 12:24:17 -0700 fastMalloc(x) can call malloc(x). According to C99 (about malloc): "If the size of the space requested is zero, the behavior is implementation- defined: either a null pointer is returned, or the behavior is as if the size were some nonzero value, except that the returned pointer shall not be used to access an object." Should I add this to the comment? 648429 5 litherum 2012-06-13 13:50:19 -0700 Moving this check into ICU wrapper functions, since they'll be not as hot as characters() 648462 6 147410 litherum 2012-06-13 14:21:13 -0700 Created attachment 147410 Patch 648469 7 147410 rniwa 2012-06-13 14:33:54 -0700 Comment on attachment 147410 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147410&action=review > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:106 > + if (!lhs && !lhsLength) > + lhs = (const UChar*)1; > + if (!rhs && !rhsLength) > + rhs = (const UChar*)1; Please use "" here instead. I don't see any value in using a made up pointer value like 1. 648494 8 147419 litherum 2012-06-13 15:00:44 -0700 Created attachment 147419 Patch 648510 9 147419 darin 2012-06-13 15:29:29 -0700 Comment on attachment 147419 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147419&action=review > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:101 > + // The ICU functions have the property where they assume that a null pointer means an invalid string > + // (and therefore won't do the comparison). A null pointer could come about here if an empty string > + // was allocated with a malloc() implementation that returns null on a zero-sized malloc (which is > + // valid according to C99 section 7.20.3). Therefore, we have to change any valid null pointers before > + // passing them to ICU. Comment is much too long. Should say something more like this: // ICU does not allow null pointers for empty strings, but we do. > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:106 > + if (!lhs && !lhsLength) > + lhs = (const UChar*)""; > + if (!rhs && !rhsLength) > + rhs = (const UChar*)""; This is wrong. You can’t just cast the pointer to an empty C string to a UChar* and expect it to work. That will read off the end of the buffer. 648514 10 147419 darin 2012-06-13 15:31:31 -0700 Comment on attachment 147419 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147419&action=review >> Source/WTF/wtf/unicode/icu/CollatorICU.cpp:106 >> + rhs = (const UChar*)""; > > This is wrong. You can’t just cast the pointer to an empty C string to a UChar* and expect it to work. That will read off the end of the buffer. Oh, I see, maybe I am wrong. This can literally be any pointer other than a null pointer! Still, do we really need a typecast? I suggest this: UChar character; if (!lhsLength) lhs = &character; if (!rhsLength) rhs = &character; Lets avoid that messy casting and also avoid making the conditions too complex. 648525 11 147430 litherum 2012-06-13 15:41:00 -0700 Created attachment 147430 Patch 648541 12 147430 ap 2012-06-13 15:56:31 -0700 Comment on attachment 147430 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147430&action=review > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:99 > + UChar dummy; Can we make it static? Pointers pointing to random places are scary. 648561 13 litherum 2012-06-13 16:09:05 -0700 Well, it's the address of a stack variable, so it's not random, but I'll make it static anyway to marginally decrease the size of the stack during the duration of this call :-] 648562 14 147440 litherum 2012-06-13 16:09:22 -0700 Created attachment 147440 Patch 648661 15 147440 darin 2012-06-13 18:34:29 -0700 Comment on attachment 147440 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147440&action=review > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:99 > + static UChar dummy; No need to make this static. A pointer to the stack is just as good as a pointer to a global variable. > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:100 > + if (!lhs && !lhsLength) We don’t need to check both of these. Doesn’t matter which we check, but I don’t want an extra branch to check both. My preference would be to only check the length. > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:101 > + lhs = &dummy; WebKit project indents 4 spaces, not 2. > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:103 > + if (!rhs && !rhsLength) > + rhs = &dummy; Same comments again. 649255 16 147608 litherum 2012-06-14 09:55:24 -0700 Created attachment 147608 Patch 651642 17 litherum 2012-06-18 13:08:22 -0700 Ping? 653153 18 147608 eric 2012-06-19 20:56:20 -0700 Comment on attachment 147608 Patch How can we test this? 653779 19 litherum 2012-06-20 12:40:06 -0700 I found this by running V8's mjsunit tests against JavaScriptCore. This was uncovered by http://v8.googlecode.com/svn/trunk/test/mjsunit/deep-recursion.js lines 52 and 55. I suppose there are a couple options here: 1) Re-write the test as a C++ unit test, creating a Collator, calling collate with (null, 0, "a", 1) and making sure it doesn't return "Equal." I could also reverse the arguments and make sure the output is reversed. I'm not sure where this unit test should end up living. 2) Add all of mjsunit to the JavaScriptCore tests inside Source/JavaScriptCore/tests 3) Add just deep-recursion.js to the JavaScriptCore tests inside Source/JavaScriptCore/tests 4) Add a comment saying this is tested in v8's mjsunit ;-) This is complicated by the fact that it looks like the only tests in Source/JavaScriptCore/tests are regular expression tests (not applicable here), performance tests (also not applicable here) and the mozilla test suite. This test doesn't belong in any of those places. Also, adding existing source might get complicated because of possibly-conflicting licenses. I'm willing to do whatever the community thinks is best. 659915 20 litherum 2012-06-28 16:04:08 -0700 Ping? 695518 21 147608 darin 2012-08-14 16:27:21 -0700 Comment on attachment 147608 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147608&action=review > Source/WTF/ChangeLog:9 > + * wtf/text/StringImpl.h: > + (WTF::StringImpl::characters): This is not the function nor the file we are modifying. 704750 22 160578 litherum 2012-08-25 16:42:19 -0700 Created attachment 160578 Patch 704760 23 160578 benjamin 2012-08-25 17:18:18 -0700 Comment on attachment 160578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160578&action=review I would: -modify Collator::collate to take two String or StringImpl instead of the raw data -add the special cases based on the string classes. Why do we even have to invoke ucol_strcoll if one of the string is empty? -Add a layout test and if possible add a test through Webkit test API. Do we need ucol_strcoll if the two strings are 8bits anyway? > Source/WTF/ChangeLog:8 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). No description. > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:98 > + blank line. > Source/WTF/wtf/unicode/icu/CollatorICU.cpp:99 > + UChar dummy; UChar dummy = 0; 704814 24 litherum 2012-08-26 01:13:40 -0700 Darin had previously marked the patch as review+. Can you (Benjamin) and him (Darin) come to an agreement about what should be done? I'd be happy to implement whatever solution is best, but I'm not sure what that is. Thanks, Myles 147191 2012-06-12 16:45:59 -0700 2012-06-13 14:21:08 -0700 Patch bug-88936-20120612164600.patch text/plain 1667 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjAxMzgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTEyICBNeWxlcyBNYXhmaWVsZCAgPG1t YXhmaWVsZEBnb29nbGUuY29tPgorCisgICAgICAgIFN0cmluZ0ltcGw6OmNoYXJhY3RlcnMgY2Fu IHJldHVybiBOVUxMIGZvciBhbiBlbXB0eSBzdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4OTM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJbXBsLmg6CisgICAgICAg IChXVEY6OlN0cmluZ0ltcGw6OmNoYXJhY3RlcnMpOgorCiAyMDEyLTA2LTExICBKb2NlbHluIFR1 cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgVXNpbmcgZXh0 cmVybmFsIElDVSBsaWJyYXJ5IG9uIGNhc2UgdW5zZW5zaXRpdmUgZHJpdmVzIHdpbGwgbm90IHdv cmsKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCShyZXZpc2lvbiAxMjAwOTQpCisrKyBT b3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMzU0LDcg KzM1NCwxOCBAQCBwdWJsaWM6CiAgICAgICAgIGlmICghaXM4Qml0KCkpCiAgICAgICAgICAgICBy ZXR1cm4gbV9kYXRhMTY7CiAKLSAgICAgICAgcmV0dXJuIGdldERhdGExNlNsb3dDYXNlKCk7Cisg ICAgICAgIC8vIFRoaXMgcmV0dXJucyBhIHBvaW50ZXIgdG8gYSBtZW1vcnkgcmFuZ2UgdGhhdCBo YXMgYmVlbiBmYXN0TWFsbG9jJ2VkLgorICAgICAgICAvLyBJZiB0aGUgc3RyaW5nIGlzIGVtcHR5 LCB0aGUgYXJndW1lbnQgdG8gZmFzdE1hbGxvYyB3aWxsIGJlIDAuIEhvd2V2ZXIsCisgICAgICAg IC8vIGZhc3RNYWxsb2MoMCkgY2FuIHJldHVybiBhIE5VTEwgcG9pbnRlci4KKyAgICAgICAgLy8g VGhlIG91dHB1dCBvZiB0aGlzIGZ1bmN0aW9uIGNhbiBiZSBwYXNzZWQgYXJvdW5kIHRvIGxpYnJh cnkgZnVuY3Rpb25zLAorICAgICAgICAvLyBzdWNoIGFzIElDVSwgd2hvIG1pZ2h0IHRoaW5rIHRo YXQgYSBOVUxMIHBvaW50ZXIgbWVhbnMgYW4gaW52YWxpZCBzdHJpbmcsCisgICAgICAgIC8vIChl dmVuIHRob3VnaCBpdCdzIGp1c3QgZW1wdHkgYW5kIHZhbGlkKSBhbmQgYmVoYXZlIGRpZmZlcmVu dGx5IHRoYW4gZXhwZWN0ZWQuCisgICAgICAgIGNvbnN0IFVDaGFyKiBvdXRwdXQgPSBnZXREYXRh MTZTbG93Q2FzZSgpOworICAgICAgICBpZiAoIW91dHB1dCkgeworICAgICAgICAgICAgQVNTRVJU KCFsZW5ndGgoKSk7CisgICAgICAgICAgICByZXR1cm4gKGNvbnN0IFVDaGFyKikxOworICAgICAg ICB9CisgICAgICAgIHJldHVybiBvdXRwdXQ7CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPHR5cGVu YW1lIENoYXJUeXBlPgo= 147410 2012-06-13 14:21:13 -0700 2012-06-13 15:00:39 -0700 Patch bug-88936-20120613142118.patch text/plain 1670 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjAxMzgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTEyICBNeWxlcyBNYXhmaWVsZCAgPG1t YXhmaWVsZEBnb29nbGUuY29tPgorCisgICAgICAgIElDVSB2aWV3cyBudWxsIHBvaW50ZXJzIGFz IGludmFsaWQsIGV2ZW4gaWYgdGhleSByZXByZXNlbnQgZW1wdHkgc3RyaW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0lt cGwuaDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y2hhcmFjdGVycyk6CisKIDIwMTItMDYt MTEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAg ICAgICBVc2luZyBleHRyZXJuYWwgSUNVIGxpYnJhcnkgb24gY2FzZSB1bnNlbnNpdGl2ZSBkcml2 ZXMgd2lsbCBub3Qgd29yawpJbmRleDogU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0 b3JJQ1UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3VuaWNvZGUvaWN1L0NvbGxh dG9ySUNVLmNwcAkocmV2aXNpb24gMTIwMDk0KQorKysgU291cmNlL1dURi93dGYvdW5pY29kZS9p Y3UvQ29sbGF0b3JJQ1UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxNyBAQCBDb2xs YXRvcjo6UmVzdWx0IENvbGxhdG9yOjpjb2xsYXRlKGNvbnN0CiAgICAgaWYgKCFtX2NvbGxhdG9y KQogICAgICAgICBjcmVhdGVDb2xsYXRvcigpOwogCisgICAgLy8gVGhlIElDVSBmdW5jdGlvbnMg aGF2ZSB0aGUgcHJvcGVydHkgd2hlcmUgdGhleSBhc3N1bWUgdGhhdCBhIG51bGwgcG9pbnRlciBt ZWFucyBhbiBpbnZhbGlkIHN0cmluZworICAgIC8vIChhbmQgdGhlcmVmb3JlIHdvbid0IGRvIHRo ZSBjb21wYXJpc29uKS4gQSBudWxsIHBvaW50ZXIgY291bGQgY29tZSBhYm91dCBoZXJlIGlmIGFu IGVtcHR5IHN0cmluZworICAgIC8vIHdhcyBhbGxvY2F0ZWQgd2l0aCBhIG1hbGxvYygpIGltcGxl bWVudGF0aW9uIHRoYXQgcmV0dXJucyBudWxsIG9uIGEgemVyby1zaXplZCBtYWxsb2MgKHdoaWNo IGlzCisgICAgLy8gdmFsaWQgYWNjb3JkaW5nIHRvIEM5OSBzZWN0aW9uIDcuMjAuMykuIFRoZXJl Zm9yZSwgd2UgaGF2ZSB0byBjaGFuZ2UgYW55IHZhbGlkIG51bGwgcG9pbnRlcnMgYmVmb3JlCisg ICAgLy8gcGFzc2luZyB0aGVtIHRvIElDVS4KKworICAgIGlmICghbGhzICYmICFsaHNMZW5ndGgp CisgICAgICBsaHMgPSAoY29uc3QgVUNoYXIqKTE7CisgICAgaWYgKCFyaHMgJiYgIXJoc0xlbmd0 aCkKKyAgICAgIHJocyA9IChjb25zdCBVQ2hhciopMTsKKwogICAgIHJldHVybiBzdGF0aWNfY2Fz dDxSZXN1bHQ+KHVjb2xfc3RyY29sbChtX2NvbGxhdG9yLCBsaHMsIGxoc0xlbmd0aCwgcmhzLCBy aHNMZW5ndGgpKTsKIH0KIAo= 147419 2012-06-13 15:00:44 -0700 2012-06-13 15:40:55 -0700 Patch bug-88936-20120613150048.patch text/plain 1672 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjAxMzgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTEyICBNeWxlcyBNYXhmaWVsZCAgPG1t YXhmaWVsZEBnb29nbGUuY29tPgorCisgICAgICAgIElDVSB2aWV3cyBudWxsIHBvaW50ZXJzIGFz IGludmFsaWQsIGV2ZW4gaWYgdGhleSByZXByZXNlbnQgZW1wdHkgc3RyaW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0lt cGwuaDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y2hhcmFjdGVycyk6CisKIDIwMTItMDYt MTEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAg ICAgICBVc2luZyBleHRyZXJuYWwgSUNVIGxpYnJhcnkgb24gY2FzZSB1bnNlbnNpdGl2ZSBkcml2 ZXMgd2lsbCBub3Qgd29yawpJbmRleDogU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0 b3JJQ1UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3VuaWNvZGUvaWN1L0NvbGxh dG9ySUNVLmNwcAkocmV2aXNpb24gMTIwMDk0KQorKysgU291cmNlL1dURi93dGYvdW5pY29kZS9p Y3UvQ29sbGF0b3JJQ1UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxNyBAQCBDb2xs YXRvcjo6UmVzdWx0IENvbGxhdG9yOjpjb2xsYXRlKGNvbnN0CiAgICAgaWYgKCFtX2NvbGxhdG9y KQogICAgICAgICBjcmVhdGVDb2xsYXRvcigpOwogCisgICAgLy8gVGhlIElDVSBmdW5jdGlvbnMg aGF2ZSB0aGUgcHJvcGVydHkgd2hlcmUgdGhleSBhc3N1bWUgdGhhdCBhIG51bGwgcG9pbnRlciBt ZWFucyBhbiBpbnZhbGlkIHN0cmluZworICAgIC8vIChhbmQgdGhlcmVmb3JlIHdvbid0IGRvIHRo ZSBjb21wYXJpc29uKS4gQSBudWxsIHBvaW50ZXIgY291bGQgY29tZSBhYm91dCBoZXJlIGlmIGFu IGVtcHR5IHN0cmluZworICAgIC8vIHdhcyBhbGxvY2F0ZWQgd2l0aCBhIG1hbGxvYygpIGltcGxl bWVudGF0aW9uIHRoYXQgcmV0dXJucyBudWxsIG9uIGEgemVyby1zaXplZCBtYWxsb2MgKHdoaWNo IGlzCisgICAgLy8gdmFsaWQgYWNjb3JkaW5nIHRvIEM5OSBzZWN0aW9uIDcuMjAuMykuIFRoZXJl Zm9yZSwgd2UgaGF2ZSB0byBjaGFuZ2UgYW55IHZhbGlkIG51bGwgcG9pbnRlcnMgYmVmb3JlCisg ICAgLy8gcGFzc2luZyB0aGVtIHRvIElDVS4KKworICAgIGlmICghbGhzICYmICFsaHNMZW5ndGgp CisgICAgICBsaHMgPSAoY29uc3QgVUNoYXIqKSIiOworICAgIGlmICghcmhzICYmICFyaHNMZW5n dGgpCisgICAgICByaHMgPSAoY29uc3QgVUNoYXIqKSIiOworCiAgICAgcmV0dXJuIHN0YXRpY19j YXN0PFJlc3VsdD4odWNvbF9zdHJjb2xsKG1fY29sbGF0b3IsIGxocywgbGhzTGVuZ3RoLCByaHMs IHJoc0xlbmd0aCkpOwogfQogCg== 147430 2012-06-13 15:41:00 -0700 2012-06-13 16:09:17 -0700 Patch bug-88936-20120613154105.patch text/plain 1289 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjAxMzgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTEyICBNeWxlcyBNYXhmaWVsZCAgPG1t YXhmaWVsZEBnb29nbGUuY29tPgorCisgICAgICAgIElDVSB2aWV3cyBudWxsIHBvaW50ZXJzIGFz IGludmFsaWQsIGV2ZW4gaWYgdGhleSByZXByZXNlbnQgZW1wdHkgc3RyaW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0lt cGwuaDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y2hhcmFjdGVycyk6CisKIDIwMTItMDYt MTEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAg ICAgICBVc2luZyBleHRyZXJuYWwgSUNVIGxpYnJhcnkgb24gY2FzZSB1bnNlbnNpdGl2ZSBkcml2 ZXMgd2lsbCBub3Qgd29yawpJbmRleDogU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0 b3JJQ1UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3VuaWNvZGUvaWN1L0NvbGxh dG9ySUNVLmNwcAkocmV2aXNpb24gMTIwMDk0KQorKysgU291cmNlL1dURi93dGYvdW5pY29kZS9p Y3UvQ29sbGF0b3JJQ1UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxNCBAQCBDb2xs YXRvcjo6UmVzdWx0IENvbGxhdG9yOjpjb2xsYXRlKGNvbnN0CiAgICAgaWYgKCFtX2NvbGxhdG9y KQogICAgICAgICBjcmVhdGVDb2xsYXRvcigpOwogCisgICAgLy8gSUNVIGRvZXMgbm90IGFsbG93 IG51bGwgcG9pbnRlcnMgZm9yIGVtcHR5IHN0cmluZ3MsIGJ1dCB3ZSBkby4KKworICAgIFVDaGFy IGR1bW15OworICAgIGlmICghbGhzICYmICFsaHNMZW5ndGgpCisgICAgICBsaHMgPSAmZHVtbXk7 CisgICAgaWYgKCFyaHMgJiYgIXJoc0xlbmd0aCkKKyAgICAgIHJocyA9ICZkdW1teTsKKwogICAg IHJldHVybiBzdGF0aWNfY2FzdDxSZXN1bHQ+KHVjb2xfc3RyY29sbChtX2NvbGxhdG9yLCBsaHMs IGxoc0xlbmd0aCwgcmhzLCByaHNMZW5ndGgpKTsKIH0KIAo= 147440 2012-06-13 16:09:22 -0700 2012-06-14 09:55:14 -0700 Patch bug-88936-20120613160927.patch text/plain 1296 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjAxMzgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTEyICBNeWxlcyBNYXhmaWVsZCAgPG1t YXhmaWVsZEBnb29nbGUuY29tPgorCisgICAgICAgIElDVSB2aWV3cyBudWxsIHBvaW50ZXJzIGFz IGludmFsaWQsIGV2ZW4gaWYgdGhleSByZXByZXNlbnQgZW1wdHkgc3RyaW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0lt cGwuaDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y2hhcmFjdGVycyk6CisKIDIwMTItMDYt MTEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAg ICAgICBVc2luZyBleHRyZXJuYWwgSUNVIGxpYnJhcnkgb24gY2FzZSB1bnNlbnNpdGl2ZSBkcml2 ZXMgd2lsbCBub3Qgd29yawpJbmRleDogU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0 b3JJQ1UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3VuaWNvZGUvaWN1L0NvbGxh dG9ySUNVLmNwcAkocmV2aXNpb24gMTIwMDk0KQorKysgU291cmNlL1dURi93dGYvdW5pY29kZS9p Y3UvQ29sbGF0b3JJQ1UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxNCBAQCBDb2xs YXRvcjo6UmVzdWx0IENvbGxhdG9yOjpjb2xsYXRlKGNvbnN0CiAgICAgaWYgKCFtX2NvbGxhdG9y KQogICAgICAgICBjcmVhdGVDb2xsYXRvcigpOwogCisgICAgLy8gSUNVIGRvZXMgbm90IGFsbG93 IG51bGwgcG9pbnRlcnMgZm9yIGVtcHR5IHN0cmluZ3MsIGJ1dCB3ZSBkby4KKworICAgIHN0YXRp YyBVQ2hhciBkdW1teTsKKyAgICBpZiAoIWxocyAmJiAhbGhzTGVuZ3RoKQorICAgICAgbGhzID0g JmR1bW15OworICAgIGlmICghcmhzICYmICFyaHNMZW5ndGgpCisgICAgICByaHMgPSAmZHVtbXk7 CisKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVzdWx0Pih1Y29sX3N0cmNvbGwobV9jb2xsYXRv ciwgbGhzLCBsaHNMZW5ndGgsIHJocywgcmhzTGVuZ3RoKSk7CiB9CiAK 147608 2012-06-14 09:55:24 -0700 2012-08-25 16:42:12 -0700 Patch bug-88936-20120614095531.patch text/plain 1277 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjAxMzgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTEyICBNeWxlcyBNYXhmaWVsZCAgPG1t YXhmaWVsZEBnb29nbGUuY29tPgorCisgICAgICAgIElDVSB2aWV3cyBudWxsIHBvaW50ZXJzIGFz IGludmFsaWQsIGV2ZW4gaWYgdGhleSByZXByZXNlbnQgZW1wdHkgc3RyaW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0lt cGwuaDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y2hhcmFjdGVycyk6CisKIDIwMTItMDYt MTEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAg ICAgICBVc2luZyBleHRyZXJuYWwgSUNVIGxpYnJhcnkgb24gY2FzZSB1bnNlbnNpdGl2ZSBkcml2 ZXMgd2lsbCBub3Qgd29yawpJbmRleDogU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0 b3JJQ1UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3VuaWNvZGUvaWN1L0NvbGxh dG9ySUNVLmNwcAkocmV2aXNpb24gMTIwMDk0KQorKysgU291cmNlL1dURi93dGYvdW5pY29kZS9p Y3UvQ29sbGF0b3JJQ1UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxNCBAQCBDb2xs YXRvcjo6UmVzdWx0IENvbGxhdG9yOjpjb2xsYXRlKGNvbnN0CiAgICAgaWYgKCFtX2NvbGxhdG9y KQogICAgICAgICBjcmVhdGVDb2xsYXRvcigpOwogCisgICAgLy8gSUNVIGRvZXMgbm90IGFsbG93 IG51bGwgcG9pbnRlcnMgZm9yIGVtcHR5IHN0cmluZ3MsIGJ1dCB3ZSBkby4KKworICAgIFVDaGFy IGR1bW15OworICAgIGlmICghbGhzTGVuZ3RoKQorICAgICAgICBsaHMgPSAmZHVtbXk7CisgICAg aWYgKCFyaHNMZW5ndGgpCisgICAgICAgIHJocyA9ICZkdW1teTsKKwogICAgIHJldHVybiBzdGF0 aWNfY2FzdDxSZXN1bHQ+KHVjb2xfc3RyY29sbChtX2NvbGxhdG9yLCBsaHMsIGxoc0xlbmd0aCwg cmhzLCByaHNMZW5ndGgpKTsKIH0KIAo= 160578 2012-08-25 16:42:19 -0700 2012-08-25 17:18:18 -0700 Patch bug-88936-20120825164213.patch text/plain 1387 litherum SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjY2OTApCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTI1ICBNeWxlcyBDLiBNYXhmaWVsZCAg PGxpdGhlcnVtQGdtYWlsLmNvbT4KKworICAgICAgICBJQ1Ugdmlld3MgbnVsbCBwb2ludGVycyBh cyBpbnZhbGlkLCBldmVuIGlmIHRoZXkgcmVwcmVzZW50IGVtcHR5IHN0cmluZ3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4OTM2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaXRpb25hbCBpbmZvcm1h dGlvbiBvZiB0aGUgY2hhbmdlIHN1Y2ggYXMgYXBwcm9hY2gsIHJhdGlvbmFsZS4gUGxlYXNlIGFk ZCBwZXItZnVuY3Rpb24gZGVzY3JpcHRpb25zIGJlbG93IChPT1BTISkuCisKKyAgICAgICAgKiB3 dGYvdW5pY29kZS9pY3UvQ29sbGF0b3JJQ1UuY3BwOgorICAgICAgICAoV1RGOjpDb2xsYXRvcjo6 Y29sbGF0ZSk6CisKIDIwMTItMDgtMjQgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIFRvdWNoIFBsYXRmb3JtLmggdG8gc29sdmUgYSBidWlsZCBkZXBl bmRlbmN5IGlzc3VlCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi91bmljb2RlL2ljdS9Db2xsYXRvcklD VS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvdW5pY29kZS9pY3UvQ29sbGF0b3JJ Q1UuY3BwCShyZXZpc2lvbiAxMjY2ODkpCisrKyBTb3VyY2UvV1RGL3d0Zi91bmljb2RlL2ljdS9D b2xsYXRvcklDVS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0LDYgKzk0LDE0IEBAIENvbGxhdG9y OjpSZXN1bHQgQ29sbGF0b3I6OmNvbGxhdGUoY29uc3QKICAgICBpZiAoIW1fY29sbGF0b3IpCiAg ICAgICAgIGNyZWF0ZUNvbGxhdG9yKCk7CiAKKyAgICAvLyBJQ1UgZG9lcyBub3QgYWxsb3cgbnVs bCBwb2ludGVycyBmb3IgZW1wdHkgc3RyaW5ncywgYnV0IHdlIGRvLgorCisgICAgVUNoYXIgZHVt bXk7CisgICAgaWYgKCFsaHNMZW5ndGgpCisgICAgICAgIGxocyA9ICZkdW1teTsKKyAgICBpZiAo IXJoc0xlbmd0aCkKKyAgICAgICAgcmhzID0gJmR1bW15OworCiAgICAgcmV0dXJuIHN0YXRpY19j YXN0PFJlc3VsdD4odWNvbF9zdHJjb2xsKG1fY29sbGF0b3IsIGxocywgbGhzTGVuZ3RoLCByaHMs IHJoc0xlbmd0aCkpOwogfQogCg==