38630 2010-05-06 01:13:06 -0700 VS2010 asserts a null iterator passed to std::copy in Vector::operator= 2010-11-04 05:47:47 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) PC Windows 7 CLOSED FIXED Qt, QtTriaged P2 Normal --- 35784 1 jturcotte webkit-qt-unassigned ap hausmann kenneth mjs tkent webkit.review.bot oldest_to_newest 221552 0 jturcotte 2010-05-06 01:13:06 -0700 This happens when copying an empty Vector over another empty Vector. Release builds works correctly. 221555 1 55211 jturcotte 2010-05-06 01:16:18 -0700 Created attachment 55211 Patch Fixes the assert. 222600 2 ap 2010-05-07 13:58:40 -0700 It's not good for performance to add another branch. Perhaps this should only be done when building with VS2010? And a bug should probably be filed with Microsoft. 222895 3 tkent 2010-05-08 10:25:48 -0700 AFAIK, passing 0 to an Iterator parameter is invalid in C++. So this behavior of VS2010 seems reasonable. If we worry about the performance, we should use "#if COMPILER(MSVC)" here. 222902 4 tkent 2010-05-08 10:43:00 -0700 I think we should add just } else if (!other.size()) return *this; (No removing "if (!begin()) return *this;") This is an optimization for all compilers and solve the VS2010 issue. 222906 5 ap 2010-05-08 10:57:00 -0700 I do not see any restrictions on input or output iterators in copy() algorithm description in C++ standard. Do you have a reference for this requirement? > This is an optimization for all compilers and solve the VS2010 issue. That also sounds like an extra branch in common case. Or did I misunderstand your proposal? 223028 6 tkent 2010-05-09 02:58:21 -0700 (In reply to comment #5) > I do not see any restrictions on input or output iterators in copy() algorithm > description in C++ standard. Do you have a reference for this requirement? I checked the C++0x draft, and I think i was wrong. 0 can be a valid iterator in general. The standard says neither "The OutputIterator parameter must be dereferenceable" nor "It may be not dereferenceable if [first, last) is empty." So we can't assume the VS2010 behavior is a bug. > > This is an optimization for all compilers and solve the VS2010 issue. > > That also sounds like an extra branch in common case. Or did I misunderstand your proposal? Yes, it will make an extra branch. But it will skip the following 3-lines of the code in a case of empty vectors. I have no strong preference on it. I think either of it or "#if COMPILER(MSVC)" are ok. 223252 7 55543 jturcotte 2010-05-10 04:53:35 -0700 Created attachment 55543 Kent's proposal patch Here is a patch for the proposed fix. This adds a branch when other.size() is non-zero and fits in capacity(), but exit earlier in other cases. I would also be ok with wrapping the previous patch in a MSVC/MSVC2010 specific macro piece if you think this one has issues. Anyhow the msvc behavior, being a bug or not, has been reported there: https://connect.microsoft.com/VisualStudio/feedback/details/558044/std-copy-should-not-check-dest-when-first-last 223258 8 webkit.review.bot 2010-05-10 05:02:02 -0700 Attachment 55543 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 JavaScriptCore/wtf/Vector.h:680: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] JavaScriptCore/wtf/Vector.h:705: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 223264 9 55545 jturcotte 2010-05-10 05:32:10 -0700 Created attachment 55545 Kent's proposal patch v2 Fix style issues 223267 10 55545 tkent 2010-05-10 06:05:14 -0700 Comment on attachment 55545 Kent's proposal patch v2 > @@ -677,14 +677,17 @@ namespace WTF { > if (&other == this) > return *this; > > - if (size() > other.size()) > + if (size() > other.size()) { > shrink(other.size()); > - else if (other.size() > capacity()) { > + return *this; > + } This branch just resizes 'this' and doesn't copy the content of 'other'. 223361 11 55545 ap 2010-05-10 09:52:05 -0700 Comment on attachment 55545 Kent's proposal patch v2 > The standard says neither "The OutputIterator parameter must be dereferenceable" > nor "It may be not dereferenceable if [first, last) is empty." So we can't > assume the VS2010 behavior is a bug. The standard doesn't need to explicitly mention everything it allows. If there is no restriction, then it's allowed. Please make this fix only for MSVC2010, file a bug with them, and reference this bug in a comment in code, so that we could know when to remove the workaround. - if (size() > other.size()) + if (size() > other.size()) { shrink(other.size()); - else if (other.size() > capacity()) { + return *this; + } This doesn't look like it could possibly work. Did you run regression tests with this patch? Or am I just confused? 223362 12 ap 2010-05-10 09:53:01 -0700 > This branch just resizes 'this' and doesn't copy the content of 'other'. Sorry, didn't see your comment before reviewing. So, I'm not just confused :-) 223840 13 55682 jturcotte 2010-05-11 02:50:45 -0700 Created attachment 55682 Patch v2 (In reply to comment #11) > This doesn't look like it could possibly work. Did you run regression tests with this patch? Or am I just confused? No, there was a lack of testing from my part on this patch, sorry about that. Here is the first patch enclosed to apply only when the assert would pop. Adding only "else if (!other.size()) return *this;" would not prevent the assert when size() > other.size() and the buffer gets shrunk to 0. See Comment #7 for a link to the reported visual studio bug. 223938 14 55682 ap 2010-05-11 08:44:50 -0700 Comment on attachment 55682 Patch v2 +// Workarounds an assert in VS2010. See https://bugs.webkit.org/show_bug.cgi?id=38630 There is no verb "workarounds", it's either a noun or "works around". I still think that it would be better to have a direct link to MS issue. The use case for this comment is: can I remove this code now? - click link - read. With a Bugzilla link, there is an extra step involved. On the other hand, the Bugzilla link may be more stable. r=me, but please fix the grammar issue. 225752 15 jturcotte 2010-05-14 04:28:48 -0700 Committed r59463: <http://trac.webkit.org/changeset/59463> Changes since the review: - Fixed the grammar issue - The link in the code points to the VS issue instead - Changed the preprocessor expression to also match when _ITERATOR_DEBUG_LEVEL == 1 thanks! 225843 16 hausmann 2010-05-14 08:39:03 -0700 Revision r59463 cherry-picked into qtwebkit-2.0 with commit a1a9dda8011dbd6ffc40bad8b4e62d2d3bf95916 304606 17 jturcotte 2010-11-04 05:42:22 -0700 Update: The bug has been fixed in Visual Studio and the fix will be available in VS2011. http://connect.microsoft.com/VisualStudio/feedback/details/558044/std-copy-should-not-check-dest-when-first-last 304609 18 jturcotte 2010-11-04 05:47:47 -0700 (In reply to comment #17) > The bug has been fixed in Visual Studio and the fix will be available in VS2011. err.. I mean VC11 55211 2010-05-06 01:16:18 -0700 2010-05-10 04:53:35 -0700 Patch vs2010_assertfix.patch text/plain 1657 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA3YWRjYWM2Li4wNzExY2E3IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMDUtMDYgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggYSBWUzIwMTAgYXNzZXJ0IGluIHN0ZDo6Y29weS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NjMwCisKKyAgICAgICAgKiB3dGYvVmVjdG9yLmg6 CisgICAgICAgIChXVEY6Ojo6b3BlcmF0b3IpOiBBbHdheXMgZG8gdGhlICJpZiBudWxsIiBjaGVj aworCiAyMDEwLTA1LTAyICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL0phdmFT Y3JpcHRDb3JlL3d0Zi9WZWN0b3IuaCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3IuaAppbmRl eCBlNDk1MDY3Li5hZDkyY2RmIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9y LmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL1ZlY3Rvci5oCkBAIC02ODIsMTAgKzY4MiwxMCBA QCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgZWxzZSBpZiAob3RoZXIuc2l6ZSgpID4gY2FwYWNp dHkoKSkgewogICAgICAgICAgICAgY2xlYXIoKTsKICAgICAgICAgICAgIHJlc2VydmVDYXBhY2l0 eShvdGhlci5zaXplKCkpOwotICAgICAgICAgICAgaWYgKCFiZWdpbigpKQotICAgICAgICAgICAg ICAgIHJldHVybiAqdGhpczsKICAgICAgICAgfQogICAgICAgICAKKyAgICAgICAgaWYgKCFiZWdp bigpKQorICAgICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgICAgICBzdGQ6OmNvcHkob3RoZXIu YmVnaW4oKSwgb3RoZXIuYmVnaW4oKSArIHNpemUoKSwgYmVnaW4oKSk7CiAgICAgICAgIFR5cGVP cGVyYXRpb25zOjp1bmluaXRpYWxpemVkQ29weShvdGhlci5iZWdpbigpICsgc2l6ZSgpLCBvdGhl ci5lbmQoKSwgZW5kKCkpOwogICAgICAgICBtX3NpemUgPSBvdGhlci5zaXplKCk7CkBAIC03MDUs MTAgKzcwNSwxMCBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgZWxzZSBpZiAob3RoZXIuc2l6 ZSgpID4gY2FwYWNpdHkoKSkgewogICAgICAgICAgICAgY2xlYXIoKTsKICAgICAgICAgICAgIHJl c2VydmVDYXBhY2l0eShvdGhlci5zaXplKCkpOwotICAgICAgICAgICAgaWYgKCFiZWdpbigpKQot ICAgICAgICAgICAgICAgIHJldHVybiAqdGhpczsKICAgICAgICAgfQogICAgICAgICAKKyAgICAg ICAgaWYgKCFiZWdpbigpKQorICAgICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgICAgICBzdGQ6 OmNvcHkob3RoZXIuYmVnaW4oKSwgb3RoZXIuYmVnaW4oKSArIHNpemUoKSwgYmVnaW4oKSk7CiAg ICAgICAgIFR5cGVPcGVyYXRpb25zOjp1bmluaXRpYWxpemVkQ29weShvdGhlci5iZWdpbigpICsg c2l6ZSgpLCBvdGhlci5lbmQoKSwgZW5kKCkpOwogICAgICAgICBtX3NpemUgPSBvdGhlci5zaXpl KCk7Cg== 55543 2010-05-10 04:53:35 -0700 2010-05-10 05:32:10 -0700 Kent's proposal patch vs2010_assertfix.patch text/plain 2155 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBlYjJmOTdkLi4wMjFmNGEwIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTAtMDUtMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggYSBWUzIwMTAgYXNzZXJ0IGluIHN0ZDo6Y29weQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MzAKKworICAgICAgICBUaGUgYXNzZXJ0IGNvbXBs YWlucyB0aGF0IHRoZSBvdXRwdXQgaXRlcmF0b3IgaXMgbnVsbC4KKworICAgICAgICAqIHd0Zi9W ZWN0b3IuaDoKKyAgICAgICAgKFdURjo6OjpvcGVyYXRvcik6CisKIDIwMTAtMDUtMDYgIEZ1bWl0 b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxl eGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3Iu aCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3IuaAppbmRleCBlNDk1MDY3Li42MjhkNTk4IDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9yLmgKKysrIGIvSmF2YVNjcmlwdENv cmUvd3RmL1ZlY3Rvci5oCkBAIC02NzcsMTQgKzY3NywxNiBAQCBuYW1lc3BhY2UgV1RGIHsKICAg ICAgICAgaWYgKCZvdGhlciA9PSB0aGlzKQogICAgICAgICAgICAgcmV0dXJuICp0aGlzOwogICAg ICAgICAKLSAgICAgICAgaWYgKHNpemUoKSA+IG90aGVyLnNpemUoKSkKKyAgICAgICAgaWYgKHNp emUoKSA+IG90aGVyLnNpemUoKSkgewogICAgICAgICAgICAgc2hyaW5rKG90aGVyLnNpemUoKSk7 Ci0gICAgICAgIGVsc2UgaWYgKG90aGVyLnNpemUoKSA+IGNhcGFjaXR5KCkpIHsKKyAgICAgICAg ICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfSBlbHNlIGlmIChvdGhlci5zaXplKCkgPiBjYXBh Y2l0eSgpKSB7CiAgICAgICAgICAgICBjbGVhcigpOwogICAgICAgICAgICAgcmVzZXJ2ZUNhcGFj aXR5KG90aGVyLnNpemUoKSk7CiAgICAgICAgICAgICBpZiAoIWJlZ2luKCkpCiAgICAgICAgICAg ICAgICAgcmV0dXJuICp0aGlzOwotICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAoIW90aGVy LnNpemUoKSkKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKICAgICAgICAgCiAgICAgICAgIHN0 ZDo6Y29weShvdGhlci5iZWdpbigpLCBvdGhlci5iZWdpbigpICsgc2l6ZSgpLCBiZWdpbigpKTsK ICAgICAgICAgVHlwZU9wZXJhdGlvbnM6OnVuaW5pdGlhbGl6ZWRDb3B5KG90aGVyLmJlZ2luKCkg KyBzaXplKCksIG90aGVyLmVuZCgpLCBlbmQoKSk7CkBAIC03MDAsMTQgKzcwMiwxNiBAQCBuYW1l c3BhY2UgV1RGIHsKICAgICAgICAgaWYgKCZvdGhlciA9PSB0aGlzKQogICAgICAgICAgICAgcmV0 dXJuICp0aGlzOwogICAgICAgICAKLSAgICAgICAgaWYgKHNpemUoKSA+IG90aGVyLnNpemUoKSkK KyAgICAgICAgaWYgKHNpemUoKSA+IG90aGVyLnNpemUoKSkgewogICAgICAgICAgICAgc2hyaW5r KG90aGVyLnNpemUoKSk7Ci0gICAgICAgIGVsc2UgaWYgKG90aGVyLnNpemUoKSA+IGNhcGFjaXR5 KCkpIHsKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfSBlbHNlIGlmIChvdGhl ci5zaXplKCkgPiBjYXBhY2l0eSgpKSB7CiAgICAgICAgICAgICBjbGVhcigpOwogICAgICAgICAg ICAgcmVzZXJ2ZUNhcGFjaXR5KG90aGVyLnNpemUoKSk7CiAgICAgICAgICAgICBpZiAoIWJlZ2lu KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuICp0aGlzOwotICAgICAgICB9CisgICAgICAgIH0g ZWxzZSBpZiAoIW90aGVyLnNpemUoKSkKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKICAgICAg ICAgCiAgICAgICAgIHN0ZDo6Y29weShvdGhlci5iZWdpbigpLCBvdGhlci5iZWdpbigpICsgc2l6 ZSgpLCBiZWdpbigpKTsKICAgICAgICAgVHlwZU9wZXJhdGlvbnM6OnVuaW5pdGlhbGl6ZWRDb3B5 KG90aGVyLmJlZ2luKCkgKyBzaXplKCksIG90aGVyLmVuZCgpLCBlbmQoKSk7Cg== 55545 2010-05-10 05:32:10 -0700 2010-05-11 02:50:45 -0700 Kent's proposal patch v2 vs2010_assertfix.patch text/plain 2163 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBlYjJmOTdkLi4wMjFmNGEwIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTAtMDUtMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggYSBWUzIwMTAgYXNzZXJ0IGluIHN0ZDo6Y29weQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MzAKKworICAgICAgICBUaGUgYXNzZXJ0IGNvbXBs YWlucyB0aGF0IHRoZSBvdXRwdXQgaXRlcmF0b3IgaXMgbnVsbC4KKworICAgICAgICAqIHd0Zi9W ZWN0b3IuaDoKKyAgICAgICAgKFdURjo6OjpvcGVyYXRvcik6CisKIDIwMTAtMDUtMDYgIEZ1bWl0 b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxl eGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3Iu aCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3IuaAppbmRleCBlNDk1MDY3Li4zNTJiZWFjIDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9yLmgKKysrIGIvSmF2YVNjcmlwdENv cmUvd3RmL1ZlY3Rvci5oCkBAIC02NzcsMTQgKzY3NywxNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAg ICAgICAgaWYgKCZvdGhlciA9PSB0aGlzKQogICAgICAgICAgICAgcmV0dXJuICp0aGlzOwogICAg ICAgICAKLSAgICAgICAgaWYgKHNpemUoKSA+IG90aGVyLnNpemUoKSkKKyAgICAgICAgaWYgKHNp emUoKSA+IG90aGVyLnNpemUoKSkgewogICAgICAgICAgICAgc2hyaW5rKG90aGVyLnNpemUoKSk7 Ci0gICAgICAgIGVsc2UgaWYgKG90aGVyLnNpemUoKSA+IGNhcGFjaXR5KCkpIHsKKyAgICAgICAg ICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfQorICAgICAgICBpZiAob3RoZXIuc2l6ZSgpID4g Y2FwYWNpdHkoKSkgewogICAgICAgICAgICAgY2xlYXIoKTsKICAgICAgICAgICAgIHJlc2VydmVD YXBhY2l0eShvdGhlci5zaXplKCkpOwogICAgICAgICAgICAgaWYgKCFiZWdpbigpKQogICAgICAg ICAgICAgICAgIHJldHVybiAqdGhpczsKLSAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYgKCFv dGhlci5zaXplKCkpCisgICAgICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgICAgIAogICAgICAg ICBzdGQ6OmNvcHkob3RoZXIuYmVnaW4oKSwgb3RoZXIuYmVnaW4oKSArIHNpemUoKSwgYmVnaW4o KSk7CiAgICAgICAgIFR5cGVPcGVyYXRpb25zOjp1bmluaXRpYWxpemVkQ29weShvdGhlci5iZWdp bigpICsgc2l6ZSgpLCBvdGhlci5lbmQoKSwgZW5kKCkpOwpAQCAtNzAwLDE0ICs3MDMsMTcgQEAg bmFtZXNwYWNlIFdURiB7CiAgICAgICAgIGlmICgmb3RoZXIgPT0gdGhpcykKICAgICAgICAgICAg IHJldHVybiAqdGhpczsKICAgICAgICAgCi0gICAgICAgIGlmIChzaXplKCkgPiBvdGhlci5zaXpl KCkpCisgICAgICAgIGlmIChzaXplKCkgPiBvdGhlci5zaXplKCkpIHsKICAgICAgICAgICAgIHNo cmluayhvdGhlci5zaXplKCkpOwotICAgICAgICBlbHNlIGlmIChvdGhlci5zaXplKCkgPiBjYXBh Y2l0eSgpKSB7CisgICAgICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgICAgIH0KKyAgICAgICAg aWYgKG90aGVyLnNpemUoKSA+IGNhcGFjaXR5KCkpIHsKICAgICAgICAgICAgIGNsZWFyKCk7CiAg ICAgICAgICAgICByZXNlcnZlQ2FwYWNpdHkob3RoZXIuc2l6ZSgpKTsKICAgICAgICAgICAgIGlm ICghYmVnaW4oKSkKICAgICAgICAgICAgICAgICByZXR1cm4gKnRoaXM7Ci0gICAgICAgIH0KKyAg ICAgICAgfSBlbHNlIGlmICghb3RoZXIuc2l6ZSgpKQorICAgICAgICAgICAgcmV0dXJuICp0aGlz OwogICAgICAgICAKICAgICAgICAgc3RkOjpjb3B5KG90aGVyLmJlZ2luKCksIG90aGVyLmJlZ2lu KCkgKyBzaXplKCksIGJlZ2luKCkpOwogICAgICAgICBUeXBlT3BlcmF0aW9uczo6dW5pbml0aWFs aXplZENvcHkob3RoZXIuYmVnaW4oKSArIHNpemUoKSwgb3RoZXIuZW5kKCksIGVuZCgpKTsK 55682 2010-05-11 02:50:45 -0700 2010-05-11 08:44:49 -0700 Patch v2 vs2010_assertfix.patch text/plain 1771 jturcotte ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBlYjJmOTdkLi4wMjFmNGEwIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTAtMDUtMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggYSBWUzIwMTAgYXNzZXJ0IGluIHN0ZDo6Y29weQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MzAKKworICAgICAgICBUaGUgYXNzZXJ0IGNvbXBs YWlucyB0aGF0IHRoZSBvdXRwdXQgaXRlcmF0b3IgaXMgbnVsbC4KKworICAgICAgICAqIHd0Zi9W ZWN0b3IuaDoKKyAgICAgICAgKFdURjo6OjpvcGVyYXRvcik6CisKIDIwMTAtMDUtMDYgIEZ1bWl0 b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxl eGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3Iu aCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3IuaAppbmRleCBlNDk1MDY3Li4wMWFkNTI5IDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9yLmgKKysrIGIvSmF2YVNjcmlwdENv cmUvd3RmL1ZlY3Rvci5oCkBAIC02ODYsNiArNjg2LDEyIEBAIG5hbWVzcGFjZSBXVEYgewogICAg ICAgICAgICAgICAgIHJldHVybiAqdGhpczsKICAgICAgICAgfQogICAgICAgICAKKy8vIFdvcmth cm91bmRzIGFuIGFzc2VydCBpbiBWUzIwMTAuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Mzg2MzAKKyNpZiBDT01QSUxFUihNU1ZDKSAmJiBkZWZpbmVkKF9JVEVS QVRPUl9ERUJVR19MRVZFTCkgJiYgX0lURVJBVE9SX0RFQlVHX0xFVkVMID4gMQorICAgICAgICBp ZiAoIWJlZ2luKCkpCisgICAgICAgICAgICByZXR1cm4gKnRoaXM7CisjZW5kaWYKKwogICAgICAg ICBzdGQ6OmNvcHkob3RoZXIuYmVnaW4oKSwgb3RoZXIuYmVnaW4oKSArIHNpemUoKSwgYmVnaW4o KSk7CiAgICAgICAgIFR5cGVPcGVyYXRpb25zOjp1bmluaXRpYWxpemVkQ29weShvdGhlci5iZWdp bigpICsgc2l6ZSgpLCBvdGhlci5lbmQoKSwgZW5kKCkpOwogICAgICAgICBtX3NpemUgPSBvdGhl ci5zaXplKCk7CkBAIC03MDksNiArNzE1LDEyIEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICAg ICAgICAgIHJldHVybiAqdGhpczsKICAgICAgICAgfQogICAgICAgICAKKy8vIFdvcmthcm91bmRz IGFuIGFzc2VydCBpbiBWUzIwMTAuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mzg2MzAKKyNpZiBDT01QSUxFUihNU1ZDKSAmJiBkZWZpbmVkKF9JVEVSQVRPUl9E RUJVR19MRVZFTCkgJiYgX0lURVJBVE9SX0RFQlVHX0xFVkVMID4gMQorICAgICAgICBpZiAoIWJl Z2luKCkpCisgICAgICAgICAgICByZXR1cm4gKnRoaXM7CisjZW5kaWYKKwogICAgICAgICBzdGQ6 OmNvcHkob3RoZXIuYmVnaW4oKSwgb3RoZXIuYmVnaW4oKSArIHNpemUoKSwgYmVnaW4oKSk7CiAg ICAgICAgIFR5cGVPcGVyYXRpb25zOjp1bmluaXRpYWxpemVkQ29weShvdGhlci5iZWdpbigpICsg c2l6ZSgpLCBvdGhlci5lbmQoKSwgZW5kKCkpOwogICAgICAgICBtX3NpemUgPSBvdGhlci5zaXpl KCk7Cg==