44593 2010-08-25 01:47:01 -0700 [Qt] Fix warnings in WebKit2 directory 2010-08-31 22:15:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 44870 43191 1 ossy ossy abarth abecsi eric kbalazs sam tonikitoo webkit-ews webkit.review.bot oldest_to_newest 269096 0 ossy 2010-08-25 01:47:01 -0700 Warnings on Qt Linux Release buildbot: ../../../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp:61: warning: unused variable ‘numberOfBytesRead’ ../../../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp:73: warning: unused variable ‘numberOfBytesRead’ ../../../WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp:126: warning: unused variable ‘bytesWritten’ ../../../WebKit2/Shared/qt/WebEventFactoryQt.cpp:176: warning: ‘state’ may be used uninitialized in this function ../../../WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:54: warning: ‘npEvent’ is used uninitialized in this function Fix is coming soon. 269102 1 65386 ossy 2010-08-25 02:03:46 -0700 Created attachment 65386 proposed fix 269143 2 65386 abecsi 2010-08-25 03:55:47 -0700 Comment on attachment 65386 proposed fix WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:  + Just try npEvent = NPEvent(), else the new could leak. If this gets implemented this should be initialized. WebKit2/Shared/qt/WebEventFactoryQt.cpp:200 + state = WebPlatformTouchPoint::TouchReleased; This initialization should be at the beginning, I think this would avoid confusion. The ASSERT is needed however. Otherwise LGTM, but I'm not a reviewer :) 269144 3 65386 kenneth 2010-08-25 04:03:46 -0700 Comment on attachment 65386 proposed fix WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp:62 + (void)numberOfBytesRead; Isn't there a macro for that? Please check wtf. Qt normally uses Q_UNUSED 269159 4 65398 ossy 2010-08-25 04:53:34 -0700 Created attachment 65398 proposed fix Updated version based on comments of Andras and Kenneth. 269166 5 webkit-ews 2010-08-25 05:08:52 -0700 Attachment 65398 did not build on qt: Build output: http://queues.webkit.org/results/3769682 269167 6 65398 ossy 2010-08-25 05:11:35 -0700 Comment on attachment 65398 proposed fix It isn't my day. :) Fix is coming soon. 269168 7 65402 ossy 2010-08-25 05:13:23 -0700 Created attachment 65402 proposed fix Qt build fixed. 269179 8 abecsi 2010-08-25 05:31:05 -0700 (In reply to comment #7) > Created an attachment (id=65402) [details] > proposed fix > > Qt build fixed. LGTM. 269209 9 65402 tonikitoo 2010-08-25 06:28:13 -0700 Comment on attachment 65402 proposed fix Looks good, but need another round. > diff --git a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp > index 3e77e46..aae977b 100644 > --- a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp > +++ b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp > @@ -59,6 +59,7 @@ void Connection::readyReadHandler() > while (m_socket->bytesAvailable()) { > if (!m_currentMessageSize) { > size_t numberOfBytesRead = m_socket->read(reinterpret_cast<char*>(m_readBuffer.data()), sizeof(size_t)); > + Q_UNUSED(numberOfBytesRead); > ASSERT(numberOfBytesRead); combine both Q_UNUSED and ASSERT in a ASSERT_UNUSED > m_currentMessageSize = *reinterpret_cast<size_t*>(m_readBuffer.data()); > } > @@ -71,6 +72,7 @@ void Connection::readyReadHandler() > } > > size_t numberOfBytesRead = m_socket->read(reinterpret_cast<char*>(m_readBuffer.data()), m_currentMessageSize); > + Q_UNUSED(numberOfBytesRead); > ASSERT(numberOfBytesRead); Ditto. > // The messageID is encoded at the end of the buffer. > @@ -124,7 +126,7 @@ bool Connection::sendOutgoingMessage(MessageID messageID, PassOwnPtr<ArgumentEnc > m_socket->write(reinterpret_cast<char*>(&bufferSize), sizeof(bufferSize)); > > qint64 bytesWritten = m_socket->write(reinterpret_cast<char*>(arguments->buffer()), arguments->bufferSize()); > - > + Q_UNUSED(bytesWritten); > ASSERT(bytesWritten == arguments->bufferSize()); Ditto. > return true; > } > diff --git a/WebKit2/Shared/qt/WebEventFactoryQt.cpp b/WebKit2/Shared/qt/WebEventFactoryQt.cpp > index bdd6a23..043b35e 100644 > --- a/WebKit2/Shared/qt/WebEventFactoryQt.cpp > +++ b/WebKit2/Shared/qt/WebEventFactoryQt.cpp > @@ -173,7 +173,7 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(QKeyEvent* event) > WebTouchEvent WebEventFactory::createWebTouchEvent(QTouchEvent* event) > { > WebEvent::Type type = webEventTypeForEvent(event); > - WebPlatformTouchPoint::TouchPointState state; > + WebPlatformTouchPoint::TouchPointState state = static_cast<WebPlatformTouchPoint::TouchPointState>(0); > unsigned int id; > WebEvent::Modifiers modifiers = modifiersForEvent(event->modifiers()); > double timestamp = WTF::currentTime(); > @@ -196,6 +196,9 @@ WebTouchEvent WebEventFactory::createWebTouchEvent(QTouchEvent* event) > case Qt::TouchPointStationary: > state = WebPlatformTouchPoint::TouchStationary; > break; > + default: > + ASSERT_NOT_REACHED(); > + break; > } > > m_touchPoints.append(WebPlatformTouchPoint(id, state, points.at(i).screenPos().toPoint().x(), > diff --git a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp > index b8bbb87..3f2ae4f 100644 > --- a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp > +++ b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp > @@ -47,7 +47,7 @@ void NetscapePlugin::platformPaint(GraphicsContext* context, const IntRect& dirt > > NPEvent toNP(const WebMouseEvent& event) > { > - NPEvent npEvent; > + NPEvent npEvent = NPEvent(); > > notImplemented(); > Strange it is need. I thought the default constructor would do this trick. 269227 10 ossy 2010-08-25 07:12:26 -0700 ASSERT_UNUSED != Q_UNUSED + ASSERT , because Q_UNUSED differs for ICC and RVCT. Maybe ICC and RVCT don't like (void)x; So I think Q_UNUSED would be better here. 1.) #define ASSERT_UNUSED(variable, assertion) ((void)variable) 2.) #if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT) template <typename T> inline void qUnused(T &x) { (void)x; } # define Q_UNUSED(x) qUnused(x); #else # define Q_UNUSED(x) (void)x; #endif >> NPEvent toNP(const WebMouseEvent& event) >> { >> - NPEvent npEvent; >> + NPEvent npEvent = NPEvent(); >> >> notImplemented(); >> > Strange it is need. I thought the default constructor would do this trick. An NPEvent can be a QEvent (if XP_SYMBIAN), a struct (if XP_WIN or XP_OS2), XEvent (if XP_WIN) or a simple void* otherwise. Consequently we should initialize this local variable explicitly to make compilers happy. 269230 11 65402 ossy 2010-08-25 07:16:10 -0700 Comment on attachment 65402 proposed fix r? again, because I think Q_UNUSED is correct. 269239 12 sam 2010-08-25 07:25:36 -0700 (In reply to comment #11) > (From update of attachment 65402 [details]) > r? again, because I think Q_UNUSED is correct. I don't see any reason to use Q_UNUSED, but it is your call. In most of platform specific code we use the WTF versions. 269241 13 ossy 2010-08-25 07:34:08 -0700 (In reply to comment #12) > I don't see any reason to use Q_UNUSED, but it is your call. In most of platform specific code we use the WTF versions. I found 64 occurences of Q_UNUSED mainly in Qt API layers. 271400 14 ossy 2010-08-30 06:24:01 -0700 ping? Kenneth or Antonio, could you review my patch, please? The question is ASSERT_UNUSED or (Q_UNUSED + ASSERT)? 271402 15 kbalazs 2010-08-30 06:44:22 -0700 (In reply to comment #14) > ping? > > Kenneth or Antonio, could you review my patch, please? > The question is ASSERT_UNUSED or (Q_UNUSED + ASSERT)? Definitely ASSERT_UNUSED. 271403 16 tonikitoo 2010-08-30 06:45:10 -0700 (In reply to comment #14) > ping? > > Kenneth or Antonio, could you review my patch, please? > The question is ASSERT_UNUSED or (Q_UNUSED + ASSERT)? Does not ASSERT_UNUSED build for you? I do not have a strong preference on it, but it looks like it was developed to cases like this. 271407 17 kbalazs 2010-08-30 06:50:38 -0700 (In reply to comment #15) > (In reply to comment #14) > > ping? > > > > Kenneth or Antonio, could you review my patch, please? > > The question is ASSERT_UNUSED or (Q_UNUSED + ASSERT)? > > Definitely ASSERT_UNUSED. Ok, I did not read the bug before writing this, however I think if it is necessary than we should rather fix ASSET_UNUSED for ICC and RVCT. 271409 18 ossy 2010-08-30 06:52:03 -0700 (In reply to comment #16) > Does not ASSERT_UNUSED build for you? I do not have a strong preference on it, but it looks like it was developed to cases like this. ASSERT_UNUSED build for me, but I can't test with ICC and RVCT. :( I think there is a reason why are 64 occurences of Q_UNUSED in WebKit trunk. 271411 19 ossy 2010-08-30 06:54:21 -0700 (In reply to comment #17) > Ok, I did not read the bug before writing this, however I think if it is necessary than we should rather fix ASSET_UNUSED for ICC and RVCT. Good idea. ASSERT_UNUSED should call Q_UNUSED if PLATFORM(QT) is true. 271442 20 65916 ossy 2010-08-30 08:24:43 -0700 Created attachment 65916 proposed fix ASSERT_UNUSED will call Q_UNUSED, so we don't need to call Q_UNUSED + ASSERT anymore: https://bugs.webkit.org/show_bug.cgi?id=44870 271448 21 webkit-ews 2010-08-30 08:55:07 -0700 Attachment 65916 did not build on qt: Build output: http://queues.webkit.org/results/3871154 271450 22 65916 ossy 2010-08-30 08:56:30 -0700 Comment on attachment 65916 proposed fix one more round needed :S 271455 23 65919 ossy 2010-08-30 09:06:35 -0700 Created attachment 65919 proposed fix again 272161 24 65919 ossy 2010-08-31 10:01:37 -0700 Comment on attachment 65919 proposed fix again Clearing flags on attachment: 65919 Committed r66495: <http://trac.webkit.org/changeset/66495> 272162 25 ossy 2010-08-31 10:01:48 -0700 All reviewed patches have been landed. Closing bug. 272637 26 webkit.review.bot 2010-08-31 22:15:51 -0700 http://trac.webkit.org/changeset/66495 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/66493 http://trac.webkit.org/changeset/66494 http://trac.webkit.org/changeset/66495 65386 2010-08-25 02:03:46 -0700 2010-08-25 04:53:34 -0700 proposed fix 1.patch text/plain 3561 ossy ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmJiZTA3My4uYzY5OGMzZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOC0yNSAgQ3NhYmEgT3N6dHJv Z29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHdhcm5pbmdzIGluIFdlYktpdDIgZGlyZWN0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDU5Mwor CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiBNYXJrIHVu dXNlZCB2YXJpYWJsZXMgZm9yIGNvbXBpbGVyLgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlv bjo6cmVhZHlSZWFkSGFuZGxlcik6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZW5k T3V0Z29pbmdNZXNzYWdlKToKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZl bnQpOiBzdGF0ZSB2YXJpYWJsZSBpcyBpbml0aWFsaXplZCBpbiBhbGwgY2FzZQorICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9OZXRzY2FwZVBsdWdpblF0LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6dG9OUCk6IFJldHVybiBpbml0aWFsaXplZCBOUEV2ZW50LgorCiAyMDEw LTA4LTI0ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0 YW1wZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQ Qy9xdC9Db25uZWN0aW9uUXQuY3BwIGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3F0L0Nvbm5l Y3Rpb25RdC5jcHAKaW5kZXggM2U3N2U0Ni4uYWFlOTc3YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9Q bGF0Zm9ybS9Db3JlSVBDL3F0L0Nvbm5lY3Rpb25RdC5jcHAKKysrIGIvV2ViS2l0Mi9QbGF0Zm9y bS9Db3JlSVBDL3F0L0Nvbm5lY3Rpb25RdC5jcHAKQEAgLTU5LDYgKzU5LDcgQEAgdm9pZCBDb25u ZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyKCkKICAgICB3aGlsZSAobV9zb2NrZXQtPmJ5dGVzQXZh aWxhYmxlKCkpIHsKICAgICAgICAgaWYgKCFtX2N1cnJlbnRNZXNzYWdlU2l6ZSkgewogICAgICAg ICAgICAgc2l6ZV90IG51bWJlck9mQnl0ZXNSZWFkID0gbV9zb2NrZXQtPnJlYWQocmVpbnRlcnBy ZXRfY2FzdDxjaGFyKj4obV9yZWFkQnVmZmVyLmRhdGEoKSksIHNpemVvZihzaXplX3QpKTsKKyAg ICAgICAgICAgICh2b2lkKW51bWJlck9mQnl0ZXNSZWFkOwogICAgICAgICAgICAgQVNTRVJUKG51 bWJlck9mQnl0ZXNSZWFkKTsKICAgICAgICAgICAgIG1fY3VycmVudE1lc3NhZ2VTaXplID0gKnJl aW50ZXJwcmV0X2Nhc3Q8c2l6ZV90Kj4obV9yZWFkQnVmZmVyLmRhdGEoKSk7CiAgICAgICAgIH0K QEAgLTcxLDYgKzcyLDcgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyKCkKICAg ICAgICAgfQogCiAgICAgICAgIHNpemVfdCBudW1iZXJPZkJ5dGVzUmVhZCA9IG1fc29ja2V0LT5y ZWFkKHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KG1fcmVhZEJ1ZmZlci5kYXRhKCkpLCBtX2N1cnJl bnRNZXNzYWdlU2l6ZSk7CisgICAgICAgICh2b2lkKW51bWJlck9mQnl0ZXNSZWFkOwogICAgICAg ICBBU1NFUlQobnVtYmVyT2ZCeXRlc1JlYWQpOwogCiAgICAgICAgIC8vIFRoZSBtZXNzYWdlSUQg aXMgZW5jb2RlZCBhdCB0aGUgZW5kIG9mIHRoZSBidWZmZXIuCkBAIC0xMjQsNyArMTI2LDcgQEAg Ym9vbCBDb25uZWN0aW9uOjpzZW5kT3V0Z29pbmdNZXNzYWdlKE1lc3NhZ2VJRCBtZXNzYWdlSUQs IFBhc3NPd25QdHI8QXJndW1lbnRFbmMKICAgICBtX3NvY2tldC0+d3JpdGUocmVpbnRlcnByZXRf Y2FzdDxjaGFyKj4oJmJ1ZmZlclNpemUpLCBzaXplb2YoYnVmZmVyU2l6ZSkpOwogCiAgICAgcWlu dDY0IGJ5dGVzV3JpdHRlbiA9IG1fc29ja2V0LT53cml0ZShyZWludGVycHJldF9jYXN0PGNoYXIq Pihhcmd1bWVudHMtPmJ1ZmZlcigpKSwgYXJndW1lbnRzLT5idWZmZXJTaXplKCkpOwotCisgICAg KHZvaWQpYnl0ZXNXcml0dGVuOwogICAgIEFTU0VSVChieXRlc1dyaXR0ZW4gPT0gYXJndW1lbnRz LT5idWZmZXJTaXplKCkpOwogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwIGIvV2ViS2l0Mi9TaGFyZWQvcXQvV2Vi RXZlbnRGYWN0b3J5UXQuY3BwCmluZGV4IGJkZDZhMjMuLjkwZjQ2ZTYgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcAorKysgYi9XZWJLaXQyL1NoYXJl ZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKQEAgLTE5Niw2ICsxOTYsMTAgQEAgV2ViVG91Y2hF dmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZlbnQoUVRvdWNoRXZlbnQqIGV2 ZW50KQogICAgICAgICBjYXNlIFF0OjpUb3VjaFBvaW50U3RhdGlvbmFyeTogCiAgICAgICAgICAg ICBzdGF0ZSA9IFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hTdGF0aW9uYXJ5OyAKICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgc3RhdGUgPSBXZWJQ bGF0Zm9ybVRvdWNoUG9pbnQ6OlRvdWNoUmVsZWFzZWQ7CisgICAgICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKICAgICAgICAgbV90 b3VjaFBvaW50cy5hcHBlbmQoV2ViUGxhdGZvcm1Ub3VjaFBvaW50KGlkLCBzdGF0ZSwgcG9pbnRz LmF0KGkpLnNjcmVlblBvcygpLnRvUG9pbnQoKS54KCksCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9OZXRzY2FwZVBsdWdpblF0LmNwcCBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3BwCmlu ZGV4IGI4YmJiODcuLjBlZjFlZTMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3BwCkBAIC00NywxMSAr NDcsOCBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBhaW50KEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGlydAogCiBOUEV2ZW50IHRvTlAoY29uc3QgV2Vi TW91c2VFdmVudCYgZXZlbnQpCiB7Ci0gICAgTlBFdmVudCBucEV2ZW50OwotCiAgICAgbm90SW1w bGVtZW50ZWQoKTsKLQotICAgIHJldHVybiBucEV2ZW50OworICAgIHJldHVybiAqbmV3IE5QRXZl bnQ7CiB9CiAKIGJvb2wgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VFdmVudChj b25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkK 65398 2010-08-25 04:53:34 -0700 2010-08-25 05:13:23 -0700 proposed fix 1.patch text/plain 3967 ossy ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmJiZTA3My4uYzY5OGMzZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOC0yNSAgQ3NhYmEgT3N6dHJv Z29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHdhcm5pbmdzIGluIFdlYktpdDIgZGlyZWN0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDU5Mwor CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiBNYXJrIHVu dXNlZCB2YXJpYWJsZXMgZm9yIGNvbXBpbGVyLgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlv bjo6cmVhZHlSZWFkSGFuZGxlcik6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZW5k T3V0Z29pbmdNZXNzYWdlKToKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZl bnQpOiBJbml0aWFsaXplIHN0YXRlIHZhcmlhYmxlLiBEZWZhdWx0IGNhc2UgYWRkZWQuCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3Bw OgorICAgICAgICAoV2ViS2l0Ojp0b05QKTogUmV0dXJuIGluaXRpYWxpemVkIE5QRXZlbnQuCisK IDIwMTAtMDgtMjQgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBSdWJi ZXItc3RhbXBlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9D b3JlSVBDL3F0L0Nvbm5lY3Rpb25RdC5jcHAgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQv Q29ubmVjdGlvblF0LmNwcAppbmRleCAzZTc3ZTQ2Li5hYWU5NzdiIDEwMDY0NAotLS0gYS9XZWJL aXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcAorKysgYi9XZWJLaXQyL1Bs YXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcApAQCAtNTksNiArNTksNyBAQCB2b2lk IENvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAgIHdoaWxlIChtX3NvY2tldC0+Ynl0 ZXNBdmFpbGFibGUoKSkgewogICAgICAgICBpZiAoIW1fY3VycmVudE1lc3NhZ2VTaXplKSB7CiAg ICAgICAgICAgICBzaXplX3QgbnVtYmVyT2ZCeXRlc1JlYWQgPSBtX3NvY2tldC0+cmVhZChyZWlu dGVycHJldF9jYXN0PGNoYXIqPihtX3JlYWRCdWZmZXIuZGF0YSgpKSwgc2l6ZW9mKHNpemVfdCkp OworICAgICAgICAgICAgUV9VTlVTRUQobnVtYmVyT2ZCeXRlc1JlYWQpOwogICAgICAgICAgICAg QVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKICAgICAgICAgICAgIG1fY3VycmVudE1lc3NhZ2VT aXplID0gKnJlaW50ZXJwcmV0X2Nhc3Q8c2l6ZV90Kj4obV9yZWFkQnVmZmVyLmRhdGEoKSk7CiAg ICAgICAgIH0KQEAgLTcxLDYgKzcyLDcgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5k bGVyKCkKICAgICAgICAgfQogCiAgICAgICAgIHNpemVfdCBudW1iZXJPZkJ5dGVzUmVhZCA9IG1f c29ja2V0LT5yZWFkKHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KG1fcmVhZEJ1ZmZlci5kYXRhKCkp LCBtX2N1cnJlbnRNZXNzYWdlU2l6ZSk7CisgICAgICAgIFFfVU5VU0VEKG51bWJlck9mQnl0ZXNS ZWFkKTsKICAgICAgICAgQVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKIAogICAgICAgICAvLyBU aGUgbWVzc2FnZUlEIGlzIGVuY29kZWQgYXQgdGhlIGVuZCBvZiB0aGUgYnVmZmVyLgpAQCAtMTI0 LDcgKzEyNiw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVzc2FnZShNZXNzYWdl SUQgbWVzc2FnZUlELCBQYXNzT3duUHRyPEFyZ3VtZW50RW5jCiAgICAgbV9zb2NrZXQtPndyaXRl KHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KCZidWZmZXJTaXplKSwgc2l6ZW9mKGJ1ZmZlclNpemUp KTsKIAogICAgIHFpbnQ2NCBieXRlc1dyaXR0ZW4gPSBtX3NvY2tldC0+d3JpdGUocmVpbnRlcnBy ZXRfY2FzdDxjaGFyKj4oYXJndW1lbnRzLT5idWZmZXIoKSksIGFyZ3VtZW50cy0+YnVmZmVyU2l6 ZSgpKTsKLQorICAgIFFfVU5VU0VEKGJ5dGVzV3JpdHRlbik7CiAgICAgQVNTRVJUKGJ5dGVzV3Jp dHRlbiA9PSBhcmd1bWVudHMtPmJ1ZmZlclNpemUoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRp ZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAgYi9XZWJL aXQyL1NoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKaW5kZXggYmRkNmEyMy4uMDQzYjM1 ZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisr KyBiL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcApAQCAtMTczLDcgKzE3 Myw3IEBAIFdlYktleWJvYXJkRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJLZXlib2Fy ZEV2ZW50KFFLZXlFdmVudCogZXZlbnQpCiBXZWJUb3VjaEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6 Y3JlYXRlV2ViVG91Y2hFdmVudChRVG91Y2hFdmVudCogZXZlbnQpCiB7CiAgICAgV2ViRXZlbnQ6 OlR5cGUgdHlwZSAgPSB3ZWJFdmVudFR5cGVGb3JFdmVudChldmVudCk7Ci0gICAgV2ViUGxhdGZv cm1Ub3VjaFBvaW50OjpUb3VjaFBvaW50U3RhdGUgc3RhdGU7CisgICAgV2ViUGxhdGZvcm1Ub3Vj aFBvaW50OjpUb3VjaFBvaW50U3RhdGUgc3RhdGUgPSBzdGF0aWNfY2FzdDxXZWJQbGF0Zm9ybVRv dWNoUG9pbnQ6OlRvdWNoUG9pbnRTdGF0ZT4wOwogICAgIHVuc2lnbmVkIGludCBpZDsKICAgICBX ZWJFdmVudDo6TW9kaWZpZXJzIG1vZGlmaWVycyAgID0gbW9kaWZpZXJzRm9yRXZlbnQoZXZlbnQt Pm1vZGlmaWVycygpKTsKICAgICBkb3VibGUgdGltZXN0YW1wICAgICAgICAgICAgICAgID0gV1RG OjpjdXJyZW50VGltZSgpOwpAQCAtMTk2LDYgKzE5Niw5IEBAIFdlYlRvdWNoRXZlbnQgV2ViRXZl bnRGYWN0b3J5OjpjcmVhdGVXZWJUb3VjaEV2ZW50KFFUb3VjaEV2ZW50KiBldmVudCkKICAgICAg ICAgY2FzZSBRdDo6VG91Y2hQb2ludFN0YXRpb25hcnk6IAogICAgICAgICAgICAgc3RhdGUgPSBX ZWJQbGF0Zm9ybVRvdWNoUG9pbnQ6OlRvdWNoU3RhdGlvbmFyeTsgCiAgICAgICAgICAgICBicmVh azsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAogICAgICAgICBtX3RvdWNoUG9pbnRzLmFw cGVuZChXZWJQbGF0Zm9ybVRvdWNoUG9pbnQoaWQsIHN0YXRlLCBwb2ludHMuYXQoaSkuc2NyZWVu UG9zKCkudG9Qb2ludCgpLngoKSwKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvcXQvTmV0c2NhcGVQbHVnaW5RdC5jcHAKaW5kZXggYjhiYmI4Ny4u M2YyYWU0ZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv cXQvTmV0c2NhcGVQbHVnaW5RdC5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvcXQvTmV0c2NhcGVQbHVnaW5RdC5jcHAKQEAgLTQ3LDcgKzQ3LDcgQEAgdm9pZCBO ZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IEludFJlY3QmIGRpcnQKIAogTlBFdmVudCB0b05QKGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2 ZW50KQogewotICAgIE5QRXZlbnQgbnBFdmVudDsKKyAgICBOUEV2ZW50IG5wRXZlbnQgPSBOUEV2 ZW50KCk7CiAKICAgICBub3RJbXBsZW1lbnRlZCgpOwogCg== 65402 2010-08-25 05:13:23 -0700 2010-08-30 07:46:48 -0700 proposed fix 1.patch text/plain 3969 ossy ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmJiZTA3My4uYzY5OGMzZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOC0yNSAgQ3NhYmEgT3N6dHJv Z29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHdhcm5pbmdzIGluIFdlYktpdDIgZGlyZWN0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDU5Mwor CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiBNYXJrIHVu dXNlZCB2YXJpYWJsZXMgZm9yIGNvbXBpbGVyLgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlv bjo6cmVhZHlSZWFkSGFuZGxlcik6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZW5k T3V0Z29pbmdNZXNzYWdlKToKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZl bnQpOiBJbml0aWFsaXplIHN0YXRlIHZhcmlhYmxlLiBEZWZhdWx0IGNhc2UgYWRkZWQuCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3Bw OgorICAgICAgICAoV2ViS2l0Ojp0b05QKTogUmV0dXJuIGluaXRpYWxpemVkIE5QRXZlbnQuCisK IDIwMTAtMDgtMjQgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBSdWJi ZXItc3RhbXBlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9D b3JlSVBDL3F0L0Nvbm5lY3Rpb25RdC5jcHAgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQv Q29ubmVjdGlvblF0LmNwcAppbmRleCAzZTc3ZTQ2Li5hYWU5NzdiIDEwMDY0NAotLS0gYS9XZWJL aXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcAorKysgYi9XZWJLaXQyL1Bs YXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcApAQCAtNTksNiArNTksNyBAQCB2b2lk IENvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAgIHdoaWxlIChtX3NvY2tldC0+Ynl0 ZXNBdmFpbGFibGUoKSkgewogICAgICAgICBpZiAoIW1fY3VycmVudE1lc3NhZ2VTaXplKSB7CiAg ICAgICAgICAgICBzaXplX3QgbnVtYmVyT2ZCeXRlc1JlYWQgPSBtX3NvY2tldC0+cmVhZChyZWlu dGVycHJldF9jYXN0PGNoYXIqPihtX3JlYWRCdWZmZXIuZGF0YSgpKSwgc2l6ZW9mKHNpemVfdCkp OworICAgICAgICAgICAgUV9VTlVTRUQobnVtYmVyT2ZCeXRlc1JlYWQpOwogICAgICAgICAgICAg QVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKICAgICAgICAgICAgIG1fY3VycmVudE1lc3NhZ2VT aXplID0gKnJlaW50ZXJwcmV0X2Nhc3Q8c2l6ZV90Kj4obV9yZWFkQnVmZmVyLmRhdGEoKSk7CiAg ICAgICAgIH0KQEAgLTcxLDYgKzcyLDcgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5k bGVyKCkKICAgICAgICAgfQogCiAgICAgICAgIHNpemVfdCBudW1iZXJPZkJ5dGVzUmVhZCA9IG1f c29ja2V0LT5yZWFkKHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KG1fcmVhZEJ1ZmZlci5kYXRhKCkp LCBtX2N1cnJlbnRNZXNzYWdlU2l6ZSk7CisgICAgICAgIFFfVU5VU0VEKG51bWJlck9mQnl0ZXNS ZWFkKTsKICAgICAgICAgQVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKIAogICAgICAgICAvLyBU aGUgbWVzc2FnZUlEIGlzIGVuY29kZWQgYXQgdGhlIGVuZCBvZiB0aGUgYnVmZmVyLgpAQCAtMTI0 LDcgKzEyNiw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVzc2FnZShNZXNzYWdl SUQgbWVzc2FnZUlELCBQYXNzT3duUHRyPEFyZ3VtZW50RW5jCiAgICAgbV9zb2NrZXQtPndyaXRl KHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KCZidWZmZXJTaXplKSwgc2l6ZW9mKGJ1ZmZlclNpemUp KTsKIAogICAgIHFpbnQ2NCBieXRlc1dyaXR0ZW4gPSBtX3NvY2tldC0+d3JpdGUocmVpbnRlcnBy ZXRfY2FzdDxjaGFyKj4oYXJndW1lbnRzLT5idWZmZXIoKSksIGFyZ3VtZW50cy0+YnVmZmVyU2l6 ZSgpKTsKLQorICAgIFFfVU5VU0VEKGJ5dGVzV3JpdHRlbik7CiAgICAgQVNTRVJUKGJ5dGVzV3Jp dHRlbiA9PSBhcmd1bWVudHMtPmJ1ZmZlclNpemUoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRp ZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAgYi9XZWJL aXQyL1NoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKaW5kZXggYmRkNmEyMy4uMDQzYjM1 ZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisr KyBiL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcApAQCAtMTczLDcgKzE3 Myw3IEBAIFdlYktleWJvYXJkRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJLZXlib2Fy ZEV2ZW50KFFLZXlFdmVudCogZXZlbnQpCiBXZWJUb3VjaEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6 Y3JlYXRlV2ViVG91Y2hFdmVudChRVG91Y2hFdmVudCogZXZlbnQpCiB7CiAgICAgV2ViRXZlbnQ6 OlR5cGUgdHlwZSAgPSB3ZWJFdmVudFR5cGVGb3JFdmVudChldmVudCk7Ci0gICAgV2ViUGxhdGZv cm1Ub3VjaFBvaW50OjpUb3VjaFBvaW50U3RhdGUgc3RhdGU7CisgICAgV2ViUGxhdGZvcm1Ub3Vj aFBvaW50OjpUb3VjaFBvaW50U3RhdGUgc3RhdGUgPSBzdGF0aWNfY2FzdDxXZWJQbGF0Zm9ybVRv dWNoUG9pbnQ6OlRvdWNoUG9pbnRTdGF0ZT4oMCk7CiAgICAgdW5zaWduZWQgaW50IGlkOwogICAg IFdlYkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzICAgPSBtb2RpZmllcnNGb3JFdmVudChldmVu dC0+bW9kaWZpZXJzKCkpOwogICAgIGRvdWJsZSB0aW1lc3RhbXAgICAgICAgICAgICAgICAgPSBX VEY6OmN1cnJlbnRUaW1lKCk7CkBAIC0xOTYsNiArMTk2LDkgQEAgV2ViVG91Y2hFdmVudCBXZWJF dmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZlbnQoUVRvdWNoRXZlbnQqIGV2ZW50KQogICAg ICAgICBjYXNlIFF0OjpUb3VjaFBvaW50U3RhdGlvbmFyeTogCiAgICAgICAgICAgICBzdGF0ZSA9 IFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hTdGF0aW9uYXJ5OyAKICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCiAgICAgICAgIG1fdG91Y2hQb2ludHMu YXBwZW5kKFdlYlBsYXRmb3JtVG91Y2hQb2ludChpZCwgc3RhdGUsIHBvaW50cy5hdChpKS5zY3Jl ZW5Qb3MoKS50b1BvaW50KCkueCgpLApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvcXQvTmV0c2NhcGVQbHVnaW5RdC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9OZXRzY2FwZVBsdWdpblF0LmNwcAppbmRleCBiOGJiYjg3 Li4zZjJhZTRmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9xdC9OZXRzY2FwZVBsdWdpblF0LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9xdC9OZXRzY2FwZVBsdWdpblF0LmNwcApAQCAtNDcsNyArNDcsNyBAQCB2b2lk IE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwg Y29uc3QgSW50UmVjdCYgZGlydAogCiBOUEV2ZW50IHRvTlAoY29uc3QgV2ViTW91c2VFdmVudCYg ZXZlbnQpCiB7Ci0gICAgTlBFdmVudCBucEV2ZW50OworICAgIE5QRXZlbnQgbnBFdmVudCA9IE5Q RXZlbnQoKTsKIAogICAgIG5vdEltcGxlbWVudGVkKCk7CiAK 65916 2010-08-30 08:24:43 -0700 2010-08-30 09:06:35 -0700 proposed fix 1.patch text/plain 4007 ossy ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZDYxNmI0YS4uN2NhNWU0YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOC0zMCAgQ3NhYmEgT3N6dHJv Z29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHdhcm5pbmdzIGluIFdlYktpdDIgZGlyZWN0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDU5Mwor CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiBNYXJrIHVu dXNlZCB2YXJpYWJsZXMgZm9yIGNvbXBpbGVyLgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlv bjo6cmVhZHlSZWFkSGFuZGxlcik6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZW5k T3V0Z29pbmdNZXNzYWdlKToKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZl bnQpOiBJbml0aWFsaXplIHN0YXRlIHZhcmlhYmxlLiBEZWZhdWx0IGNhc2UgYWRkZWQuCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3Bw OgorICAgICAgICAoV2ViS2l0Ojp0b05QKTogUmV0dXJuIGluaXRpYWxpemVkIE5QRXZlbnQuCisK IDIwMTAtMDgtMjcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3Jl SVBDL3F0L0Nvbm5lY3Rpb25RdC5jcHAgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29u bmVjdGlvblF0LmNwcAppbmRleCAzZTc3ZTQ2Li4wOGM4ZDE3IDEwMDY0NAotLS0gYS9XZWJLaXQy L1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcAorKysgYi9XZWJLaXQyL1BsYXRm b3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcApAQCAtNTksNyArNTksNyBAQCB2b2lkIENv bm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAgIHdoaWxlIChtX3NvY2tldC0+Ynl0ZXNB dmFpbGFibGUoKSkgewogICAgICAgICBpZiAoIW1fY3VycmVudE1lc3NhZ2VTaXplKSB7CiAgICAg ICAgICAgICBzaXplX3QgbnVtYmVyT2ZCeXRlc1JlYWQgPSBtX3NvY2tldC0+cmVhZChyZWludGVy cHJldF9jYXN0PGNoYXIqPihtX3JlYWRCdWZmZXIuZGF0YSgpKSwgc2l6ZW9mKHNpemVfdCkpOwot ICAgICAgICAgICAgQVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKKyAgICAgICAgICAgIEFTU0VS VF9VTlVTRUQobnVtYmVyT2ZCeXRlc1JlYWQpOwogICAgICAgICAgICAgbV9jdXJyZW50TWVzc2Fn ZVNpemUgPSAqcmVpbnRlcnByZXRfY2FzdDxzaXplX3QqPihtX3JlYWRCdWZmZXIuZGF0YSgpKTsK ICAgICAgICAgfQogCkBAIC03MSw3ICs3MSw3IEBAIHZvaWQgQ29ubmVjdGlvbjo6cmVhZHlSZWFk SGFuZGxlcigpCiAgICAgICAgIH0KIAogICAgICAgICBzaXplX3QgbnVtYmVyT2ZCeXRlc1JlYWQg PSBtX3NvY2tldC0+cmVhZChyZWludGVycHJldF9jYXN0PGNoYXIqPihtX3JlYWRCdWZmZXIuZGF0 YSgpKSwgbV9jdXJyZW50TWVzc2FnZVNpemUpOwotICAgICAgICBBU1NFUlQobnVtYmVyT2ZCeXRl c1JlYWQpOworICAgICAgICBBU1NFUlRfVU5VU0VEKG51bWJlck9mQnl0ZXNSZWFkKTsKIAogICAg ICAgICAvLyBUaGUgbWVzc2FnZUlEIGlzIGVuY29kZWQgYXQgdGhlIGVuZCBvZiB0aGUgYnVmZmVy LgogICAgICAgICBzaXplX3QgcmVhbEJ1ZmZlclNpemUgPSBtX2N1cnJlbnRNZXNzYWdlU2l6ZSAt IHNpemVvZihNZXNzYWdlSUQpOwpAQCAtMTI1LDcgKzEyNSw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6 c2VuZE91dGdvaW5nTWVzc2FnZShNZXNzYWdlSUQgbWVzc2FnZUlELCBQYXNzT3duUHRyPEFyZ3Vt ZW50RW5jCiAKICAgICBxaW50NjQgYnl0ZXNXcml0dGVuID0gbV9zb2NrZXQtPndyaXRlKHJlaW50 ZXJwcmV0X2Nhc3Q8Y2hhcio+KGFyZ3VtZW50cy0+YnVmZmVyKCkpLCBhcmd1bWVudHMtPmJ1ZmZl clNpemUoKSk7CiAKLSAgICBBU1NFUlQoYnl0ZXNXcml0dGVuID09IGFyZ3VtZW50cy0+YnVmZmVy U2l6ZSgpKTsKKyAgICBBU1NFUlRfVU5VU0VEKGJ5dGVzV3JpdHRlbiA9PSBhcmd1bWVudHMtPmJ1 ZmZlclNpemUoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIv U2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcCBiL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2 ZW50RmFjdG9yeVF0LmNwcAppbmRleCBiZGQ2YTIzLi4wMDlhNDcwIDEwMDY0NAotLS0gYS9XZWJL aXQyL1NoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKKysrIGIvV2ViS2l0Mi9TaGFyZWQv cXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCkBAIC0xNzMsNyArMTczLDcgQEAgV2ViS2V5Ym9hcmRF dmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQoUUtleUV2ZW50KiBl dmVudCkKIFdlYlRvdWNoRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJUb3VjaEV2ZW50 KFFUb3VjaEV2ZW50KiBldmVudCkKIHsKICAgICBXZWJFdmVudDo6VHlwZSB0eXBlICA9IHdlYkV2 ZW50VHlwZUZvckV2ZW50KGV2ZW50KTsKLSAgICBXZWJQbGF0Zm9ybVRvdWNoUG9pbnQ6OlRvdWNo UG9pbnRTdGF0ZSBzdGF0ZTsKKyAgICBXZWJQbGF0Zm9ybVRvdWNoUG9pbnQ6OlRvdWNoUG9pbnRT dGF0ZSBzdGF0ZSA9IHN0YXRpY19jYXN0PFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hQb2lu dFN0YXRlPigwKTsKICAgICB1bnNpZ25lZCBpbnQgaWQ7CiAgICAgV2ViRXZlbnQ6Ok1vZGlmaWVy cyBtb2RpZmllcnMgICA9IG1vZGlmaWVyc0ZvckV2ZW50KGV2ZW50LT5tb2RpZmllcnMoKSk7CiAg ICAgZG91YmxlIHRpbWVzdGFtcCAgICAgICAgICAgICAgICA9IFdURjo6Y3VycmVudFRpbWUoKTsK QEAgLTE5Niw2ICsxOTYsOSBAQCBXZWJUb3VjaEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRl V2ViVG91Y2hFdmVudChRVG91Y2hFdmVudCogZXZlbnQpCiAgICAgICAgIGNhc2UgUXQ6OlRvdWNo UG9pbnRTdGF0aW9uYXJ5OiAKICAgICAgICAgICAgIHN0YXRlID0gV2ViUGxhdGZvcm1Ub3VjaFBv aW50OjpUb3VjaFN0YXRpb25hcnk7IAogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1 bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAKICAgICAgICAgbV90b3VjaFBvaW50cy5hcHBlbmQoV2ViUGxhdGZvcm1U b3VjaFBvaW50KGlkLCBzdGF0ZSwgcG9pbnRzLmF0KGkpLnNjcmVlblBvcygpLnRvUG9pbnQoKS54 KCksCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9O ZXRzY2FwZVBsdWdpblF0LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L3F0L05ldHNjYXBlUGx1Z2luUXQuY3BwCmluZGV4IGI4YmJiODcuLjNmMmFlNGYgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2lu UXQuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNj YXBlUGx1Z2luUXQuY3BwCkBAIC00Nyw3ICs0Nyw3IEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBs YXRmb3JtUGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0 CiAKIE5QRXZlbnQgdG9OUChjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkKIHsKLSAgICBOUEV2 ZW50IG5wRXZlbnQ7CisgICAgTlBFdmVudCBucEV2ZW50ID0gTlBFdmVudCgpOwogCiAgICAgbm90 SW1wbGVtZW50ZWQoKTsKIAo= 65919 2010-08-30 09:06:35 -0700 2010-08-31 10:01:37 -0700 proposed fix again 1.patch text/plain 4059 ossy ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZDYxNmI0YS4uN2NhNWU0YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOC0zMCAgQ3NhYmEgT3N6dHJv Z29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IHdhcm5pbmdzIGluIFdlYktpdDIgZGlyZWN0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDU5Mwor CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiBNYXJrIHVu dXNlZCB2YXJpYWJsZXMgZm9yIGNvbXBpbGVyLgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlv bjo6cmVhZHlSZWFkSGFuZGxlcik6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZW5k T3V0Z29pbmdNZXNzYWdlKToKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRvdWNoRXZl bnQpOiBJbml0aWFsaXplIHN0YXRlIHZhcmlhYmxlLiBEZWZhdWx0IGNhc2UgYWRkZWQuCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3F0L05ldHNjYXBlUGx1Z2luUXQuY3Bw OgorICAgICAgICAoV2ViS2l0Ojp0b05QKTogUmV0dXJuIGluaXRpYWxpemVkIE5QRXZlbnQuCisK IDIwMTAtMDgtMjcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3Jl SVBDL3F0L0Nvbm5lY3Rpb25RdC5jcHAgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29u bmVjdGlvblF0LmNwcAppbmRleCAzZTc3ZTQ2Li4xZTRjMjJiIDEwMDY0NAotLS0gYS9XZWJLaXQy L1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcAorKysgYi9XZWJLaXQyL1BsYXRm b3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcApAQCAtNTksNyArNTksNyBAQCB2b2lkIENv bm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAgIHdoaWxlIChtX3NvY2tldC0+Ynl0ZXNB dmFpbGFibGUoKSkgewogICAgICAgICBpZiAoIW1fY3VycmVudE1lc3NhZ2VTaXplKSB7CiAgICAg ICAgICAgICBzaXplX3QgbnVtYmVyT2ZCeXRlc1JlYWQgPSBtX3NvY2tldC0+cmVhZChyZWludGVy cHJldF9jYXN0PGNoYXIqPihtX3JlYWRCdWZmZXIuZGF0YSgpKSwgc2l6ZW9mKHNpemVfdCkpOwot ICAgICAgICAgICAgQVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKKyAgICAgICAgICAgIEFTU0VS VF9VTlVTRUQobnVtYmVyT2ZCeXRlc1JlYWQsIG51bWJlck9mQnl0ZXNSZWFkKTsKICAgICAgICAg ICAgIG1fY3VycmVudE1lc3NhZ2VTaXplID0gKnJlaW50ZXJwcmV0X2Nhc3Q8c2l6ZV90Kj4obV9y ZWFkQnVmZmVyLmRhdGEoKSk7CiAgICAgICAgIH0KIApAQCAtNzEsNyArNzEsNyBAQCB2b2lkIENv bm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAgICAgICB9CiAKICAgICAgICAgc2l6ZV90 IG51bWJlck9mQnl0ZXNSZWFkID0gbV9zb2NrZXQtPnJlYWQocmVpbnRlcnByZXRfY2FzdDxjaGFy Kj4obV9yZWFkQnVmZmVyLmRhdGEoKSksIG1fY3VycmVudE1lc3NhZ2VTaXplKTsKLSAgICAgICAg QVNTRVJUKG51bWJlck9mQnl0ZXNSZWFkKTsKKyAgICAgICAgQVNTRVJUX1VOVVNFRChudW1iZXJP ZkJ5dGVzUmVhZCwgbnVtYmVyT2ZCeXRlc1JlYWQpOwogCiAgICAgICAgIC8vIFRoZSBtZXNzYWdl SUQgaXMgZW5jb2RlZCBhdCB0aGUgZW5kIG9mIHRoZSBidWZmZXIuCiAgICAgICAgIHNpemVfdCBy ZWFsQnVmZmVyU2l6ZSA9IG1fY3VycmVudE1lc3NhZ2VTaXplIC0gc2l6ZW9mKE1lc3NhZ2VJRCk7 CkBAIC0xMjUsNyArMTI1LDcgQEAgYm9vbCBDb25uZWN0aW9uOjpzZW5kT3V0Z29pbmdNZXNzYWdl KE1lc3NhZ2VJRCBtZXNzYWdlSUQsIFBhc3NPd25QdHI8QXJndW1lbnRFbmMKIAogICAgIHFpbnQ2 NCBieXRlc1dyaXR0ZW4gPSBtX3NvY2tldC0+d3JpdGUocmVpbnRlcnByZXRfY2FzdDxjaGFyKj4o YXJndW1lbnRzLT5idWZmZXIoKSksIGFyZ3VtZW50cy0+YnVmZmVyU2l6ZSgpKTsKIAotICAgIEFT U0VSVChieXRlc1dyaXR0ZW4gPT0gYXJndW1lbnRzLT5idWZmZXJTaXplKCkpOworICAgIEFTU0VS VF9VTlVTRUQoYnl0ZXNXcml0dGVuLCBieXRlc1dyaXR0ZW4gPT0gYXJndW1lbnRzLT5idWZmZXJT aXplKCkpOwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJl ZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAgYi9XZWJLaXQyL1NoYXJlZC9xdC9XZWJFdmVudEZh Y3RvcnlRdC5jcHAKaW5kZXggYmRkNmEyMy4uMDA5YTQ3MCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9T aGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisrKyBiL1dlYktpdDIvU2hhcmVkL3F0L1dl YkV2ZW50RmFjdG9yeVF0LmNwcApAQCAtMTczLDcgKzE3Myw3IEBAIFdlYktleWJvYXJkRXZlbnQg V2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJLZXlib2FyZEV2ZW50KFFLZXlFdmVudCogZXZlbnQp CiBXZWJUb3VjaEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViVG91Y2hFdmVudChRVG91 Y2hFdmVudCogZXZlbnQpCiB7CiAgICAgV2ViRXZlbnQ6OlR5cGUgdHlwZSAgPSB3ZWJFdmVudFR5 cGVGb3JFdmVudChldmVudCk7Ci0gICAgV2ViUGxhdGZvcm1Ub3VjaFBvaW50OjpUb3VjaFBvaW50 U3RhdGUgc3RhdGU7CisgICAgV2ViUGxhdGZvcm1Ub3VjaFBvaW50OjpUb3VjaFBvaW50U3RhdGUg c3RhdGUgPSBzdGF0aWNfY2FzdDxXZWJQbGF0Zm9ybVRvdWNoUG9pbnQ6OlRvdWNoUG9pbnRTdGF0 ZT4oMCk7CiAgICAgdW5zaWduZWQgaW50IGlkOwogICAgIFdlYkV2ZW50OjpNb2RpZmllcnMgbW9k aWZpZXJzICAgPSBtb2RpZmllcnNGb3JFdmVudChldmVudC0+bW9kaWZpZXJzKCkpOwogICAgIGRv dWJsZSB0aW1lc3RhbXAgICAgICAgICAgICAgICAgPSBXVEY6OmN1cnJlbnRUaW1lKCk7CkBAIC0x OTYsNiArMTk2LDkgQEAgV2ViVG91Y2hFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYlRv dWNoRXZlbnQoUVRvdWNoRXZlbnQqIGV2ZW50KQogICAgICAgICBjYXNlIFF0OjpUb3VjaFBvaW50 U3RhdGlvbmFyeTogCiAgICAgICAgICAgICBzdGF0ZSA9IFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6 VG91Y2hTdGF0aW9uYXJ5OyAKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0Ogor ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICBicmVhazsKICAg ICAgICAgfQogCiAgICAgICAgIG1fdG91Y2hQb2ludHMuYXBwZW5kKFdlYlBsYXRmb3JtVG91Y2hQ b2ludChpZCwgc3RhdGUsIHBvaW50cy5hdChpKS5zY3JlZW5Qb3MoKS50b1BvaW50KCkueCgpLApk aWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvcXQvTmV0c2Nh cGVQbHVnaW5RdC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9O ZXRzY2FwZVBsdWdpblF0LmNwcAppbmRleCBiOGJiYjg3Li4zZjJhZTRmIDEwMDY0NAotLS0gYS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9OZXRzY2FwZVBsdWdpblF0LmNw cAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9xdC9OZXRzY2FwZVBs dWdpblF0LmNwcApAQCAtNDcsNyArNDcsNyBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9y bVBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGlydAogCiBO UEV2ZW50IHRvTlAoY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQpCiB7Ci0gICAgTlBFdmVudCBu cEV2ZW50OworICAgIE5QRXZlbnQgbnBFdmVudCA9IE5QRXZlbnQoKTsKIAogICAgIG5vdEltcGxl bWVudGVkKCk7CiAK