46259 2010-09-22 05:43:45 -0700 [Qt] QNetworkReplyHandler forces buffered output for FormData with files 2011-04-29 07:22:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P3 Normal --- 0 sriram.neelakandan webkit-unassigned ademar commit-queue markus webkit-ews webkit.review.bot oldest_to_newest 282888 0 68360 sriram.neelakandan 2010-09-22 05:43:45 -0700 Created attachment 68360 intial proposal Webkit's QNRHandler.cpp does not set up Content-Length and QNetworkRequest::DoNotBufferUploadDataAttribute and eventually forces QNetworkReplyImpl to buffer up the data; This is not fine for uploading large files, since systems will run out of buffer memory Attached is a patch for fixing the same The patch is not formatted yet, approach needs to be decided yet https://lists.webkit.org/pipermail/webkit-qt/2010-September/000870.html 286726 1 webkit.review.bot 2010-09-28 21:54:46 -0700 Attachment 68360 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 286770 2 68360 kling 2010-09-29 01:11:54 -0700 Comment on attachment 68360 intial proposal View in context: https://bugs.webkit.org/attachment.cgi?id=68360&action=review r- for compilation-breaking typo and missing ChangeLog entry. Please see http://trac.webkit.org/wiki/QtWebKitContrib for information on how to make patches for WebKit, specifically the "Submitting a patch" section. > QNetworkReplyHandler.h.new:100 > + qint64 getFormDataSize() { return m_totalSize; } This method should be const. > QNetworkReplyHandler.cpp.new:70 > + m_totalSize=computeSize(); Coding style, should be "m_totalSize = computeSize();" > QNetworkReplyHandler.cpp.new:81 > + for (int i=0; i<m_formElements.size(); i++) Coding style, should be "for (int i = 0; i < m_formElements.size(); ++i)" > QNetworkReplyHandler.cpp.new:84 > + if (element.m_type == FormDataElement::data) { Coding style, shouldn't have { > QNetworkReplyHandler.cpp.new:85 > + m_dataSize+=element.m_data.size(); Coding style, should be "m_dataSize += element.m_data.size();" > QNetworkReplyHandler.cpp.new:88 > + m_fileSize+=fi.size(); Coding style, should be "m_fileSize += fi.size();" > QNetworkReplyHandler.cpp.new:94 > + return (m_dataSize + m_fileSize); Unnecessary parentheses. > QNetworkReplyHandler.cpp.new:482 > + //We may be uploading files so prevent QNR from buffering data Coding style, please leave a space after // > QNetworkReplyHandler.cpp.new:483 > + m_request.setHeader(QNetworkRequest::ContentLengthHeader, posdDevice->getFormDataSize()); Typo, "posdDevice" should be "postDevice" > QNetworkReplyHandler.cpp.new:494 > + //We may be uploading files so prevent QNR from buffering data Coding style, please leave a space after // > QNetworkReplyHandler.cpp.new:495 > + m_request.setHeader(QNetworkRequest::ContentLengthHeader, posdDevice->getFormDataSize()); Typo, "posdDevice" should be "postDevice" 288142 3 69442 sriram.neelakandan 2010-10-01 03:14:29 -0700 Created attachment 69442 Addressed style and typo errors of previous patch thanks for the review comments. Hope this one gets in 288143 4 webkit.review.bot 2010-10-01 03:16:45 -0700 Attachment 69442 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/network/qt/QNetworkReplyHandler.cpp:81: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 288147 5 webkit-ews 2010-10-01 03:22:49 -0700 Attachment 69442 did not build on qt: Build output: http://queues.webkit.org/results/4159037 288154 6 69445 sriram.neelakandan 2010-10-01 03:52:32 -0700 Created attachment 69445 Fix style and EWS errors Hope this passes style and EWS 288170 7 69445 kling 2010-10-01 04:50:35 -0700 Comment on attachment 69445 Fix style and EWS errors View in context: https://bugs.webkit.org/attachment.cgi?id=69445&action=review Close, but not quite there yet. > WebCore/platform/network/qt/QNetworkReplyHandler.cpp:88 > + if (element.m_type == FormDataElement::data) > + m_dataSize += element.m_data.size(); > + else { > + QFileInfo fi(element.m_filename); > + m_fileSize += fi.size(); > + } If building with ENABLE(BLOB), this fails to take FormDataElement::encodedBlob into account. (see FormData.h) > WebCore/platform/network/qt/QNetworkReplyHandler.cpp:92 > +#ifdef QT_NETWORK_DEBUG > + qDebug() << __PRETTY_FUNCTION__ << "FileSize=" << m_fileSize << "DataSize=" << m_dataSize; > +#endif Please remove this. This kind of output should only be added for things that are non-trivial to do using a debugger. > WebCore/platform/network/qt/QNetworkReplyHandler.h:100 > + qint64 getFormDataSize() const { return m_totalSize; } You don't need the m_totalSize member, just "return m_dataSize + m_fileSize;" 288188 8 69454 sriram.neelakandan 2010-10-01 05:29:00 -0700 Created attachment 69454 Removed m_totalSize and Debug statement Did not address BLOB support. formdataiodevice does not support BLOB yet. Will add another bug for the same. 288200 9 69454 kling 2010-10-01 06:06:31 -0700 Comment on attachment 69454 Removed m_totalSize and Debug statement Very nice, r=me 289384 10 69454 commit-queue 2010-10-04 21:16:29 -0700 Comment on attachment 69454 Removed m_totalSize and Debug statement Clearing flags on attachment: 69454 Committed r69064: <http://trac.webkit.org/changeset/69064> 289385 11 commit-queue 2010-10-04 21:16:34 -0700 All reviewed patches have been landed. Closing bug. 395254 12 ademar 2011-04-29 07:22:41 -0700 Revision r69064 cherry-picked into qtwebkit-2.1.x with commit 2bb9aaf <http://gitorious.org/webkit/qtwebkit/commit/2bb9aaf> 68360 2010-09-22 05:43:45 -0700 2010-10-01 03:14:29 -0700 intial proposal wkt_qnrh.patch text/plain 3241 sriram.neelakandan LS0tIFFOZXR3b3JrUmVwbHlIYW5kbGVyLmguNjIyMjgJMjAxMC0wOS0yMiAxNjo0OTozNy4wMDAw MDAwMDAgKzA1MzAKKysrIFFOZXR3b3JrUmVwbHlIYW5kbGVyLmgubmV3CTIwMTAtMDktMjIgMTY6 NTE6MjQuMDAwMDAwMDAwICswNTMwCkBAIC05Nyw2ICs5Nyw3IEBAIHB1YmxpYzoKICAgICB+Rm9y bURhdGFJT0RldmljZSgpOwogCiAgICAgYm9vbCBpc1NlcXVlbnRpYWwoKSBjb25zdDsKKyAgICBx aW50NjQgZ2V0Rm9ybURhdGFTaXplKCkgeyByZXR1cm4gbV90b3RhbFNpemU7IH0KIAogcHJvdGVj dGVkOgogICAgIHFpbnQ2NCByZWFkRGF0YShjaGFyKiwgcWludDY0KTsKQEAgLTEwNCwxMiArMTA1 LDE2IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKICAgICB2b2lkIG1vdmVUb05leHRFbGVtZW50 KCk7CisgICAgcWludDY0IGNvbXB1dGVTaXplKCk7CiAgICAgdm9pZCBvcGVuRmlsZUZvckN1cnJl bnRFbGVtZW50KCk7CiAKIHByaXZhdGU6CiAgICAgVmVjdG9yPEZvcm1EYXRhRWxlbWVudD4gbV9m b3JtRWxlbWVudHM7CiAgICAgUUZpbGUqIG1fY3VycmVudEZpbGU7CiAgICAgcWludDY0IG1fY3Vy cmVudERlbHRhOworICAgIHFpbnQ2NCBtX2ZpbGVTaXplOworICAgIHFpbnQ2NCBtX2RhdGFTaXpl OworICAgIHFpbnQ2NCBtX3RvdGFsU2l6ZTsKIH07CiAKIH0KLS0tIFFOZXR3b3JrUmVwbHlIYW5k bGVyLmNwcC42Nzk1MQkyMDEwLTA5LTIyIDE2OjQzOjU0LjAwMDAwMDAwMCArMDUzMAorKysgUU5l dHdvcmtSZXBseUhhbmRsZXIuY3BwLm5ldwkyMDEwLTA5LTIyIDE2OjM3OjI2LjAwMDAwMDAwMCAr MDUzMApAQCAtNTksMTggKzU5LDQyIEBAIEZvcm1EYXRhSU9EZXZpY2U6OkZvcm1EYXRhSU9EZXZp Y2UoRm9ybUQKICAgICA6IG1fZm9ybUVsZW1lbnRzKGRhdGEgPyBkYXRhLT5lbGVtZW50cygpIDog VmVjdG9yPEZvcm1EYXRhRWxlbWVudD4oKSkKICAgICAsIG1fY3VycmVudEZpbGUoMCkKICAgICAs IG1fY3VycmVudERlbHRhKDApCisgICAgLCBtX2ZpbGVTaXplKDApCisgICAgLCBtX2RhdGFTaXpl KDApCisgICAgLCBtX3RvdGFsU2l6ZSgwKQogewogICAgIHNldE9wZW5Nb2RlKEZvcm1EYXRhSU9E ZXZpY2U6OlJlYWRPbmx5KTsKIAogICAgIGlmICghbV9mb3JtRWxlbWVudHMuaXNFbXB0eSgpICYm IG1fZm9ybUVsZW1lbnRzWzBdLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxl KQogICAgICAgICBvcGVuRmlsZUZvckN1cnJlbnRFbGVtZW50KCk7CisgICAgbV90b3RhbFNpemU9 Y29tcHV0ZVNpemUoKTsKIH0KIAorCiBGb3JtRGF0YUlPRGV2aWNlOjp+Rm9ybURhdGFJT0Rldmlj ZSgpCiB7CiAgICAgZGVsZXRlIG1fY3VycmVudEZpbGU7CiB9CiAKK3FpbnQ2NCBGb3JtRGF0YUlP RGV2aWNlOjpjb21wdXRlU2l6ZSgpIAoreworICAgIGZvciAoaW50IGk9MDsgaTxtX2Zvcm1FbGVt ZW50cy5zaXplKCk7IGkrKykKKyAgICB7CisgICAgICAgIGNvbnN0IEZvcm1EYXRhRWxlbWVudCYg ZWxlbWVudCA9IG1fZm9ybUVsZW1lbnRzW2ldOworICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUg PT0gRm9ybURhdGFFbGVtZW50OjpkYXRhKSB7CisgICAgICAgICAgICBtX2RhdGFTaXplKz1lbGVt ZW50Lm1fZGF0YS5zaXplKCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBRRmlsZUlu Zm8gZmkoZWxlbWVudC5tX2ZpbGVuYW1lKTsKKyAgICAgICAgICAgIG1fZmlsZVNpemUrPWZpLnNp emUoKTsKKyAgICAgICAgfQorICAgIH0KKyNpZmRlZiBRVF9ORVRXT1JLX0RFQlVHCisgICAgcURl YnVnKCkgPDwgX19QUkVUVFlfRlVOQ1RJT05fXyA8PCAiRmlsZVNpemU9IiA8PCBtX2ZpbGVTaXpl IDw8ICJEYXRhU2l6ZT0iIDw8IG1fZGF0YVNpemU7CisjZW5kaWYKKyAgICByZXR1cm4gKG1fZGF0 YVNpemUgKyBtX2ZpbGVTaXplKTsKK30KKworCiB2b2lkIEZvcm1EYXRhSU9EZXZpY2U6Om1vdmVU b05leHRFbGVtZW50KCkKIHsKICAgICBpZiAobV9jdXJyZW50RmlsZSkKQEAgLTQ1NSw2ICs0Nzks OSBAQCB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzdGFydCgpCiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlBvc3RPcGVyYXRpb246IHsK ICAgICAgICAgICAgIEZvcm1EYXRhSU9EZXZpY2UqIHBvc3REZXZpY2UgPSBuZXcgRm9ybURhdGFJ T0RldmljZShkLT5tX2ZpcnN0UmVxdWVzdC5odHRwQm9keSgpKTsgCisgICAgICAgICAgICAvL1dl IG1heSBiZSB1cGxvYWRpbmcgZmlsZXMgc28gcHJldmVudCBRTlIgZnJvbSBidWZmZXJpbmcgZGF0 YQorICAgICAgICAgICAgbV9yZXF1ZXN0LnNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRl bnRMZW5ndGhIZWFkZXIsIHBvc2REZXZpY2UtPmdldEZvcm1EYXRhU2l6ZSgpKTsKKyAgICAgICAg ICAgIG1fcmVxdWVzdC5zZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpEb05vdEJ1ZmZlclVw bG9hZERhdGFBdHRyaWJ1dGUsIFFWYXJpYW50KHRydWUpKTsKICAgICAgICAgICAgIG1fcmVwbHkg PSBtYW5hZ2VyLT5wb3N0KG1fcmVxdWVzdCwgcG9zdERldmljZSk7CiAgICAgICAgICAgICBwb3N0 RGV2aWNlLT5zZXRQYXJlbnQobV9yZXBseSk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTQ2NCw2 ICs0OTEsOSBAQCB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzdGFydCgpCiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlB1dE9wZXJhdGlv bjogewogICAgICAgICAgICAgRm9ybURhdGFJT0RldmljZSogcHV0RGV2aWNlID0gbmV3IEZvcm1E YXRhSU9EZXZpY2UoZC0+bV9maXJzdFJlcXVlc3QuaHR0cEJvZHkoKSk7IAorICAgICAgICAgICAg Ly9XZSBtYXkgYmUgdXBsb2FkaW5nIGZpbGVzIHNvIHByZXZlbnQgUU5SIGZyb20gYnVmZmVyaW5n IGRhdGEKKyAgICAgICAgICAgIG1fcmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpD b250ZW50TGVuZ3RoSGVhZGVyLCBwb3NkRGV2aWNlLT5nZXRGb3JtRGF0YVNpemUoKSk7CisgICAg ICAgICAgICBtX3JlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6RG9Ob3RCdWZm ZXJVcGxvYWREYXRhQXR0cmlidXRlLCBRVmFyaWFudCh0cnVlKSk7CiAgICAgICAgICAgICBtX3Jl cGx5ID0gbWFuYWdlci0+cHV0KG1fcmVxdWVzdCwgcHV0RGV2aWNlKTsKICAgICAgICAgICAgIHB1 dERldmljZS0+c2V0UGFyZW50KG1fcmVwbHkpOwogICAgICAgICAgICAgYnJlYWs7Cg== 69442 2010-10-01 03:14:29 -0700 2010-10-01 03:52:32 -0700 Addressed style and typo errors of previous patch wkt_qnrh2.patch text/plain 4589 sriram.neelakandan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Njc3ODc0Zi4uODdkODM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0wMSAgU3JpcmFtIE5lZWxh a2FuZGFuICA8c3JpcmFtLm5lZWxha2FuZGFuQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVy IGZvcmNlcyBidWZmZXJlZCBvdXRwdXQgZm9yIEZvcm1EYXRhIHdpdGggZmlsZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MjU5CisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBFeGlzdGluZyBmb3JtIHN1Ym1pdCB0ZXN0cyBzaG91bGQgY292ZXIgdGhp cyBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlI YW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhSU9EZXZpY2U6OkZvcm1EYXRh SU9EZXZpY2UpOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFJT0RldmljZTo6Y29tcHV0ZVNp emUpOgorICAgICAgICAgQWRkIGNvbXB1dGVTaXplKCkgZm9yIGNvbXB1dGluZyBmb3JtIGRldmlj ZSBzaXplCisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQpOgor ICAgICAgICAgQ2FsbCBjb21wdXRlU2l6ZSgpLCBmaWxsIENvbnRlbnQtTGVuZ3RoIGFuZCBwcmV2 ZW50IFVwbG9hZERhdGEgYnVmZmVyaW5nCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9R TmV0d29ya1JlcGx5SGFuZGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFJT0Rldmlj ZTo6Z2V0Rm9ybURhdGFTaXplKToKKwogMjAxMC0wOS0zMCAgS2VudCBUYW11cmEgIDx0a2VudEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNw cAppbmRleCBjYTNhZjc1Li4yYjdjZTEzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAKQEAgLTU5LDExICs1OSwxNSBAQCBG b3JtRGF0YUlPRGV2aWNlOjpGb3JtRGF0YUlPRGV2aWNlKEZvcm1EYXRhKiBkYXRhKQogICAgIDog bV9mb3JtRWxlbWVudHMoZGF0YSA/IGRhdGEtPmVsZW1lbnRzKCkgOiBWZWN0b3I8Rm9ybURhdGFF bGVtZW50PigpKQogICAgICwgbV9jdXJyZW50RmlsZSgwKQogICAgICwgbV9jdXJyZW50RGVsdGEo MCkKKyAgICAsIG1fZmlsZVNpemUoMCkKKyAgICAsIG1fZGF0YVNpemUoMCkKKyAgICAsIG1fdG90 YWxTaXplKDApCiB7CiAgICAgc2V0T3Blbk1vZGUoRm9ybURhdGFJT0RldmljZTo6UmVhZE9ubHkp OwogCiAgICAgaWYgKCFtX2Zvcm1FbGVtZW50cy5pc0VtcHR5KCkgJiYgbV9mb3JtRWxlbWVudHNb MF0ubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEZpbGUpCiAgICAgICAgIG9wZW5G aWxlRm9yQ3VycmVudEVsZW1lbnQoKTsKKyAgICBtX3RvdGFsU2l6ZSA9IGNvbXB1dGVTaXplKCk7 CiB9CiAKIEZvcm1EYXRhSU9EZXZpY2U6On5Gb3JtRGF0YUlPRGV2aWNlKCkKQEAgLTcxLDYgKzc1 LDI0IEBAIEZvcm1EYXRhSU9EZXZpY2U6On5Gb3JtRGF0YUlPRGV2aWNlKCkKICAgICBkZWxldGUg bV9jdXJyZW50RmlsZTsKIH0KIAorcWludDY0IEZvcm1EYXRhSU9EZXZpY2U6OmNvbXB1dGVTaXpl KCkgCit7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX2Zvcm1FbGVtZW50cy5zaXplKCk7ICsr aSkKKyAgICB7CisgICAgICAgIGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCA9IG1fZm9y bUVsZW1lbnRzW2ldOworICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVt ZW50OjpkYXRhKSAKKyAgICAgICAgICAgIG1fZGF0YVNpemUgKz0gZWxlbWVudC5tX2RhdGEuc2l6 ZSgpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIFFGaWxlSW5mbyBmaShlbGVtZW50Lm1f ZmlsZW5hbWUpOworICAgICAgICAgICAgbV9maWxlU2l6ZSArPSBmaS5zaXplKCk7CisgICAgICAg IH0KKyAgICB9CisjaWZkZWYgUVRfTkVUV09SS19ERUJVRworICAgIHFEZWJ1ZygpIDw8IF9fUFJF VFRZX0ZVTkNUSU9OX18gPDwgIkZpbGVTaXplPSIgPDwgbV9maWxlU2l6ZSA8PCAiRGF0YVNpemU9 IiA8PCBtX2RhdGFTaXplOworI2VuZGlmCisgICAgcmV0dXJuIG1fZGF0YVNpemUgKyBtX2ZpbGVT aXplOworfQorCiB2b2lkIEZvcm1EYXRhSU9EZXZpY2U6Om1vdmVUb05leHRFbGVtZW50KCkKIHsK ICAgICBpZiAobV9jdXJyZW50RmlsZSkKQEAgLTQ1Myw2ICs0NzUsOSBAQCB2b2lkIFFOZXR3b3Jr UmVwbHlIYW5kbGVyOjpzdGFydCgpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBR TmV0d29ya0FjY2Vzc01hbmFnZXI6OlBvc3RPcGVyYXRpb246IHsKICAgICAgICAgICAgIEZvcm1E YXRhSU9EZXZpY2UqIHBvc3REZXZpY2UgPSBuZXcgRm9ybURhdGFJT0RldmljZShkLT5tX2ZpcnN0 UmVxdWVzdC5odHRwQm9keSgpKTsgCisgICAgICAgICAgICAvLyBXZSBtYXkgYmUgdXBsb2FkaW5n IGZpbGVzIHNvIHByZXZlbnQgUU5SIGZyb20gYnVmZmVyaW5nIGRhdGEKKyAgICAgICAgICAgIG1f cmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpDb250ZW50TGVuZ3RoSGVhZGVyLCBw b3N0RGV2aWNlLT5nZXRGb3JtRGF0YVNpemUoKSk7CisgICAgICAgICAgICBtX3JlcXVlc3Quc2V0 QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6RG9Ob3RCdWZmZXJVcGxvYWREYXRhQXR0cmlidXRl LCBRVmFyaWFudCh0cnVlKSk7CiAgICAgICAgICAgICBtX3JlcGx5ID0gbWFuYWdlci0+cG9zdCht X3JlcXVlc3QsIHBvc3REZXZpY2UpOwogICAgICAgICAgICAgcG9zdERldmljZS0+c2V0UGFyZW50 KG1fcmVwbHkpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC00NjIsNiArNDg3LDkgQEAgdm9pZCBR TmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQoKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IGNhc2UgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpQdXRPcGVyYXRpb246IHsKICAgICAgICAgICAg IEZvcm1EYXRhSU9EZXZpY2UqIHB1dERldmljZSA9IG5ldyBGb3JtRGF0YUlPRGV2aWNlKGQtPm1f Zmlyc3RSZXF1ZXN0Lmh0dHBCb2R5KCkpOyAKKyAgICAgICAgICAgIC8vIFdlIG1heSBiZSB1cGxv YWRpbmcgZmlsZXMgc28gcHJldmVudCBRTlIgZnJvbSBidWZmZXJpbmcgZGF0YQorICAgICAgICAg ICAgbV9yZXF1ZXN0LnNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRMZW5ndGhIZWFk ZXIsIHBvc3REZXZpY2UtPmdldEZvcm1EYXRhU2l6ZSgpKTsKKyAgICAgICAgICAgIG1fcmVxdWVz dC5zZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpEb05vdEJ1ZmZlclVwbG9hZERhdGFBdHRy aWJ1dGUsIFFWYXJpYW50KHRydWUpKTsKICAgICAgICAgICAgIG1fcmVwbHkgPSBtYW5hZ2VyLT5w dXQobV9yZXF1ZXN0LCBwdXREZXZpY2UpOwogICAgICAgICAgICAgcHV0RGV2aWNlLT5zZXRQYXJl bnQobV9yZXBseSk7CiAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oIGIvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmgKaW5kZXggZjZiMjM1OC4uODY0MzZi NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlI YW5kbGVyLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlI YW5kbGVyLmgKQEAgLTk3LDYgKzk3LDcgQEAgcHVibGljOgogICAgIH5Gb3JtRGF0YUlPRGV2aWNl KCk7CiAKICAgICBib29sIGlzU2VxdWVudGlhbCgpIGNvbnN0OworICAgIHFpbnQ2NCBnZXRGb3Jt RGF0YVNpemUoKSBjb25zdCB7IHJldHVybiBtX3RvdGFsU2l6ZTsgfQogCiBwcm90ZWN0ZWQ6CiAg ICAgcWludDY0IHJlYWREYXRhKGNoYXIqLCBxaW50NjQpOwpAQCAtMTA0LDEyICsxMDUsMTYgQEAg cHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIHZvaWQgbW92ZVRvTmV4dEVsZW1lbnQoKTsKKyAg ICBxaW50NjQgY29tcHV0ZVNpemUoKTsKICAgICB2b2lkIG9wZW5GaWxlRm9yQ3VycmVudEVsZW1l bnQoKTsKIAogcHJpdmF0ZToKICAgICBWZWN0b3I8Rm9ybURhdGFFbGVtZW50PiBtX2Zvcm1FbGVt ZW50czsKICAgICBRRmlsZSogbV9jdXJyZW50RmlsZTsKICAgICBxaW50NjQgbV9jdXJyZW50RGVs dGE7CisgICAgcWludDY0IG1fZmlsZVNpemU7CisgICAgcWludDY0IG1fZGF0YVNpemU7CisgICAg cWludDY0IG1fdG90YWxTaXplOwogfTsKIAogfQo= 69445 2010-10-01 03:52:32 -0700 2010-10-01 05:29:00 -0700 Fix style and EWS errors wkt_qnrh3.patch text/plain 4770 sriram.neelakandan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Njc3ODc0Zi4uODdkODM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0wMSAgU3JpcmFtIE5lZWxh a2FuZGFuICA8c3JpcmFtLm5lZWxha2FuZGFuQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVy IGZvcmNlcyBidWZmZXJlZCBvdXRwdXQgZm9yIEZvcm1EYXRhIHdpdGggZmlsZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MjU5CisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBFeGlzdGluZyBmb3JtIHN1Ym1pdCB0ZXN0cyBzaG91bGQgY292ZXIgdGhp cyBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlI YW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhSU9EZXZpY2U6OkZvcm1EYXRh SU9EZXZpY2UpOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFJT0RldmljZTo6Y29tcHV0ZVNp emUpOgorICAgICAgICAgQWRkIGNvbXB1dGVTaXplKCkgZm9yIGNvbXB1dGluZyBmb3JtIGRldmlj ZSBzaXplCisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQpOgor ICAgICAgICAgQ2FsbCBjb21wdXRlU2l6ZSgpLCBmaWxsIENvbnRlbnQtTGVuZ3RoIGFuZCBwcmV2 ZW50IFVwbG9hZERhdGEgYnVmZmVyaW5nCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9R TmV0d29ya1JlcGx5SGFuZGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFJT0Rldmlj ZTo6Z2V0Rm9ybURhdGFTaXplKToKKwogMjAxMC0wOS0zMCAgS2VudCBUYW11cmEgIDx0a2VudEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNw cAppbmRleCBjYTNhZjc1Li4zNTgyNjY2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNp bmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlIDxRRGF0ZVRpbWU+CiAjaW5jbHVk ZSA8UUZpbGU+CisjaW5jbHVkZSA8UUZpbGVJbmZvPgogI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+ CiAjaW5jbHVkZSA8UU5ldHdvcmtDb29raWU+CiAjaW5jbHVkZSA8cXdlYmZyYW1lLmg+CkBAIC01 OSwxMSArNjAsMTUgQEAgRm9ybURhdGFJT0RldmljZTo6Rm9ybURhdGFJT0RldmljZShGb3JtRGF0 YSogZGF0YSkKICAgICA6IG1fZm9ybUVsZW1lbnRzKGRhdGEgPyBkYXRhLT5lbGVtZW50cygpIDog VmVjdG9yPEZvcm1EYXRhRWxlbWVudD4oKSkKICAgICAsIG1fY3VycmVudEZpbGUoMCkKICAgICAs IG1fY3VycmVudERlbHRhKDApCisgICAgLCBtX2ZpbGVTaXplKDApCisgICAgLCBtX2RhdGFTaXpl KDApCisgICAgLCBtX3RvdGFsU2l6ZSgwKQogewogICAgIHNldE9wZW5Nb2RlKEZvcm1EYXRhSU9E ZXZpY2U6OlJlYWRPbmx5KTsKIAogICAgIGlmICghbV9mb3JtRWxlbWVudHMuaXNFbXB0eSgpICYm IG1fZm9ybUVsZW1lbnRzWzBdLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxl KQogICAgICAgICBvcGVuRmlsZUZvckN1cnJlbnRFbGVtZW50KCk7CisgICAgbV90b3RhbFNpemUg PSBjb21wdXRlU2l6ZSgpOwogfQogCiBGb3JtRGF0YUlPRGV2aWNlOjp+Rm9ybURhdGFJT0Rldmlj ZSgpCkBAIC03MSw2ICs3NiwyMyBAQCBGb3JtRGF0YUlPRGV2aWNlOjp+Rm9ybURhdGFJT0Rldmlj ZSgpCiAgICAgZGVsZXRlIG1fY3VycmVudEZpbGU7CiB9CiAKK3FpbnQ2NCBGb3JtRGF0YUlPRGV2 aWNlOjpjb21wdXRlU2l6ZSgpIAoreworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9mb3JtRWxl bWVudHMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgY29uc3QgRm9ybURhdGFFbGVtZW50JiBlbGVt ZW50ID0gbV9mb3JtRWxlbWVudHNbaV07CisgICAgICAgIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBG b3JtRGF0YUVsZW1lbnQ6OmRhdGEpIAorICAgICAgICAgICAgbV9kYXRhU2l6ZSArPSBlbGVtZW50 Lm1fZGF0YS5zaXplKCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgUUZpbGVJbmZvIGZp KGVsZW1lbnQubV9maWxlbmFtZSk7CisgICAgICAgICAgICBtX2ZpbGVTaXplICs9IGZpLnNpemUo KTsKKyAgICAgICAgfQorICAgIH0KKyNpZmRlZiBRVF9ORVRXT1JLX0RFQlVHCisgICAgcURlYnVn KCkgPDwgX19QUkVUVFlfRlVOQ1RJT05fXyA8PCAiRmlsZVNpemU9IiA8PCBtX2ZpbGVTaXplIDw8 ICJEYXRhU2l6ZT0iIDw8IG1fZGF0YVNpemU7CisjZW5kaWYKKyAgICByZXR1cm4gbV9kYXRhU2l6 ZSArIG1fZmlsZVNpemU7Cit9CisKIHZvaWQgRm9ybURhdGFJT0RldmljZTo6bW92ZVRvTmV4dEVs ZW1lbnQoKQogewogICAgIGlmIChtX2N1cnJlbnRGaWxlKQpAQCAtNDUzLDYgKzQ3NSw5IEBAIHZv aWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KCkKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6UG9zdE9wZXJhdGlvbjogewogICAgICAg ICAgICAgRm9ybURhdGFJT0RldmljZSogcG9zdERldmljZSA9IG5ldyBGb3JtRGF0YUlPRGV2aWNl KGQtPm1fZmlyc3RSZXF1ZXN0Lmh0dHBCb2R5KCkpOyAKKyAgICAgICAgICAgIC8vIFdlIG1heSBi ZSB1cGxvYWRpbmcgZmlsZXMgc28gcHJldmVudCBRTlIgZnJvbSBidWZmZXJpbmcgZGF0YQorICAg ICAgICAgICAgbV9yZXF1ZXN0LnNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRMZW5n dGhIZWFkZXIsIHBvc3REZXZpY2UtPmdldEZvcm1EYXRhU2l6ZSgpKTsKKyAgICAgICAgICAgIG1f cmVxdWVzdC5zZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpEb05vdEJ1ZmZlclVwbG9hZERh dGFBdHRyaWJ1dGUsIFFWYXJpYW50KHRydWUpKTsKICAgICAgICAgICAgIG1fcmVwbHkgPSBtYW5h Z2VyLT5wb3N0KG1fcmVxdWVzdCwgcG9zdERldmljZSk7CiAgICAgICAgICAgICBwb3N0RGV2aWNl LT5zZXRQYXJlbnQobV9yZXBseSk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTQ2Miw2ICs0ODcs OSBAQCB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzdGFydCgpCiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlB1dE9wZXJhdGlvbjogewog ICAgICAgICAgICAgRm9ybURhdGFJT0RldmljZSogcHV0RGV2aWNlID0gbmV3IEZvcm1EYXRhSU9E ZXZpY2UoZC0+bV9maXJzdFJlcXVlc3QuaHR0cEJvZHkoKSk7IAorICAgICAgICAgICAgLy8gV2Ug bWF5IGJlIHVwbG9hZGluZyBmaWxlcyBzbyBwcmV2ZW50IFFOUiBmcm9tIGJ1ZmZlcmluZyBkYXRh CisgICAgICAgICAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVu dExlbmd0aEhlYWRlciwgcHV0RGV2aWNlLT5nZXRGb3JtRGF0YVNpemUoKSk7CisgICAgICAgICAg ICBtX3JlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6RG9Ob3RCdWZmZXJVcGxv YWREYXRhQXR0cmlidXRlLCBRVmFyaWFudCh0cnVlKSk7CiAgICAgICAgICAgICBtX3JlcGx5ID0g bWFuYWdlci0+cHV0KG1fcmVxdWVzdCwgcHV0RGV2aWNlKTsKICAgICAgICAgICAgIHB1dERldmlj ZS0+c2V0UGFyZW50KG1fcmVwbHkpOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuaCBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCmluZGV4IGY2YjIz NTguLjg2NDM2YjUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0 d29ya1JlcGx5SGFuZGxlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0 d29ya1JlcGx5SGFuZGxlci5oCkBAIC05Nyw2ICs5Nyw3IEBAIHB1YmxpYzoKICAgICB+Rm9ybURh dGFJT0RldmljZSgpOwogCiAgICAgYm9vbCBpc1NlcXVlbnRpYWwoKSBjb25zdDsKKyAgICBxaW50 NjQgZ2V0Rm9ybURhdGFTaXplKCkgY29uc3QgeyByZXR1cm4gbV90b3RhbFNpemU7IH0KIAogcHJv dGVjdGVkOgogICAgIHFpbnQ2NCByZWFkRGF0YShjaGFyKiwgcWludDY0KTsKQEAgLTEwNCwxMiAr MTA1LDE2IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKICAgICB2b2lkIG1vdmVUb05leHRFbGVt ZW50KCk7CisgICAgcWludDY0IGNvbXB1dGVTaXplKCk7CiAgICAgdm9pZCBvcGVuRmlsZUZvckN1 cnJlbnRFbGVtZW50KCk7CiAKIHByaXZhdGU6CiAgICAgVmVjdG9yPEZvcm1EYXRhRWxlbWVudD4g bV9mb3JtRWxlbWVudHM7CiAgICAgUUZpbGUqIG1fY3VycmVudEZpbGU7CiAgICAgcWludDY0IG1f Y3VycmVudERlbHRhOworICAgIHFpbnQ2NCBtX2ZpbGVTaXplOworICAgIHFpbnQ2NCBtX2RhdGFT aXplOworICAgIHFpbnQ2NCBtX3RvdGFsU2l6ZTsKIH07CiAKIH0K 69454 2010-10-01 05:29:00 -0700 2010-10-04 21:16:28 -0700 Removed m_totalSize and Debug statement wkt_qnrh4.patch text/plain 4592 sriram.neelakandan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Njc3ODc0Zi4uODdkODM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0wMSAgU3JpcmFtIE5lZWxh a2FuZGFuICA8c3JpcmFtLm5lZWxha2FuZGFuQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVy IGZvcmNlcyBidWZmZXJlZCBvdXRwdXQgZm9yIEZvcm1EYXRhIHdpdGggZmlsZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MjU5CisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBFeGlzdGluZyBmb3JtIHN1Ym1pdCB0ZXN0cyBzaG91bGQgY292ZXIgdGhp cyBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlI YW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhSU9EZXZpY2U6OkZvcm1EYXRh SU9EZXZpY2UpOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFJT0RldmljZTo6Y29tcHV0ZVNp emUpOgorICAgICAgICAgQWRkIGNvbXB1dGVTaXplKCkgZm9yIGNvbXB1dGluZyBmb3JtIGRldmlj ZSBzaXplCisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQpOgor ICAgICAgICAgQ2FsbCBjb21wdXRlU2l6ZSgpLCBmaWxsIENvbnRlbnQtTGVuZ3RoIGFuZCBwcmV2 ZW50IFVwbG9hZERhdGEgYnVmZmVyaW5nCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9R TmV0d29ya1JlcGx5SGFuZGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFJT0Rldmlj ZTo6Z2V0Rm9ybURhdGFTaXplKToKKwogMjAxMC0wOS0zMCAgS2VudCBUYW11cmEgIDx0a2VudEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNw cAppbmRleCBjYTNhZjc1Li42Nzk2ZTc1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNp bmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlIDxRRGF0ZVRpbWU+CiAjaW5jbHVk ZSA8UUZpbGU+CisjaW5jbHVkZSA8UUZpbGVJbmZvPgogI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+ CiAjaW5jbHVkZSA8UU5ldHdvcmtDb29raWU+CiAjaW5jbHVkZSA8cXdlYmZyYW1lLmg+CkBAIC01 OSwxMSArNjAsMTQgQEAgRm9ybURhdGFJT0RldmljZTo6Rm9ybURhdGFJT0RldmljZShGb3JtRGF0 YSogZGF0YSkKICAgICA6IG1fZm9ybUVsZW1lbnRzKGRhdGEgPyBkYXRhLT5lbGVtZW50cygpIDog VmVjdG9yPEZvcm1EYXRhRWxlbWVudD4oKSkKICAgICAsIG1fY3VycmVudEZpbGUoMCkKICAgICAs IG1fY3VycmVudERlbHRhKDApCisgICAgLCBtX2ZpbGVTaXplKDApCisgICAgLCBtX2RhdGFTaXpl KDApCiB7CiAgICAgc2V0T3Blbk1vZGUoRm9ybURhdGFJT0RldmljZTo6UmVhZE9ubHkpOwogCiAg ICAgaWYgKCFtX2Zvcm1FbGVtZW50cy5pc0VtcHR5KCkgJiYgbV9mb3JtRWxlbWVudHNbMF0ubV90 eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEZpbGUpCiAgICAgICAgIG9wZW5GaWxlRm9y Q3VycmVudEVsZW1lbnQoKTsKKyAgICBjb21wdXRlU2l6ZSgpOwogfQogCiBGb3JtRGF0YUlPRGV2 aWNlOjp+Rm9ybURhdGFJT0RldmljZSgpCkBAIC03MSw2ICs3NSwyMCBAQCBGb3JtRGF0YUlPRGV2 aWNlOjp+Rm9ybURhdGFJT0RldmljZSgpCiAgICAgZGVsZXRlIG1fY3VycmVudEZpbGU7CiB9CiAK K3FpbnQ2NCBGb3JtRGF0YUlPRGV2aWNlOjpjb21wdXRlU2l6ZSgpIAoreworICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgbV9mb3JtRWxlbWVudHMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgY29uc3Qg Rm9ybURhdGFFbGVtZW50JiBlbGVtZW50ID0gbV9mb3JtRWxlbWVudHNbaV07CisgICAgICAgIGlm IChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGEpIAorICAgICAgICAgICAg bV9kYXRhU2l6ZSArPSBlbGVtZW50Lm1fZGF0YS5zaXplKCk7CisgICAgICAgIGVsc2UgeworICAg ICAgICAgICAgUUZpbGVJbmZvIGZpKGVsZW1lbnQubV9maWxlbmFtZSk7CisgICAgICAgICAgICBt X2ZpbGVTaXplICs9IGZpLnNpemUoKTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbV9k YXRhU2l6ZSArIG1fZmlsZVNpemU7Cit9CisKIHZvaWQgRm9ybURhdGFJT0RldmljZTo6bW92ZVRv TmV4dEVsZW1lbnQoKQogewogICAgIGlmIChtX2N1cnJlbnRGaWxlKQpAQCAtNDUzLDYgKzQ3MSw5 IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KCkKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6UG9zdE9wZXJhdGlvbjogewog ICAgICAgICAgICAgRm9ybURhdGFJT0RldmljZSogcG9zdERldmljZSA9IG5ldyBGb3JtRGF0YUlP RGV2aWNlKGQtPm1fZmlyc3RSZXF1ZXN0Lmh0dHBCb2R5KCkpOyAKKyAgICAgICAgICAgIC8vIFdl IG1heSBiZSB1cGxvYWRpbmcgZmlsZXMgc28gcHJldmVudCBRTlIgZnJvbSBidWZmZXJpbmcgZGF0 YQorICAgICAgICAgICAgbV9yZXF1ZXN0LnNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRl bnRMZW5ndGhIZWFkZXIsIHBvc3REZXZpY2UtPmdldEZvcm1EYXRhU2l6ZSgpKTsKKyAgICAgICAg ICAgIG1fcmVxdWVzdC5zZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpEb05vdEJ1ZmZlclVw bG9hZERhdGFBdHRyaWJ1dGUsIFFWYXJpYW50KHRydWUpKTsKICAgICAgICAgICAgIG1fcmVwbHkg PSBtYW5hZ2VyLT5wb3N0KG1fcmVxdWVzdCwgcG9zdERldmljZSk7CiAgICAgICAgICAgICBwb3N0 RGV2aWNlLT5zZXRQYXJlbnQobV9yZXBseSk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTQ2Miw2 ICs0ODMsOSBAQCB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzdGFydCgpCiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlB1dE9wZXJhdGlv bjogewogICAgICAgICAgICAgRm9ybURhdGFJT0RldmljZSogcHV0RGV2aWNlID0gbmV3IEZvcm1E YXRhSU9EZXZpY2UoZC0+bV9maXJzdFJlcXVlc3QuaHR0cEJvZHkoKSk7IAorICAgICAgICAgICAg Ly8gV2UgbWF5IGJlIHVwbG9hZGluZyBmaWxlcyBzbyBwcmV2ZW50IFFOUiBmcm9tIGJ1ZmZlcmlu ZyBkYXRhCisgICAgICAgICAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6 Q29udGVudExlbmd0aEhlYWRlciwgcHV0RGV2aWNlLT5nZXRGb3JtRGF0YVNpemUoKSk7CisgICAg ICAgICAgICBtX3JlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6RG9Ob3RCdWZm ZXJVcGxvYWREYXRhQXR0cmlidXRlLCBRVmFyaWFudCh0cnVlKSk7CiAgICAgICAgICAgICBtX3Jl cGx5ID0gbWFuYWdlci0+cHV0KG1fcmVxdWVzdCwgcHV0RGV2aWNlKTsKICAgICAgICAgICAgIHB1 dERldmljZS0+c2V0UGFyZW50KG1fcmVwbHkpOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuaCBi L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCmluZGV4 IGY2YjIzNTguLmI2NGQ1ZmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9x dC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9x dC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCkBAIC05Nyw2ICs5Nyw3IEBAIHB1YmxpYzoKICAgICB+ Rm9ybURhdGFJT0RldmljZSgpOwogCiAgICAgYm9vbCBpc1NlcXVlbnRpYWwoKSBjb25zdDsKKyAg ICBxaW50NjQgZ2V0Rm9ybURhdGFTaXplKCkgY29uc3QgeyByZXR1cm4gbV9maWxlU2l6ZSArIG1f ZGF0YVNpemU7IH0KIAogcHJvdGVjdGVkOgogICAgIHFpbnQ2NCByZWFkRGF0YShjaGFyKiwgcWlu dDY0KTsKQEAgLTEwNCwxMiArMTA1LDE1IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKICAgICB2 b2lkIG1vdmVUb05leHRFbGVtZW50KCk7CisgICAgcWludDY0IGNvbXB1dGVTaXplKCk7CiAgICAg dm9pZCBvcGVuRmlsZUZvckN1cnJlbnRFbGVtZW50KCk7CiAKIHByaXZhdGU6CiAgICAgVmVjdG9y PEZvcm1EYXRhRWxlbWVudD4gbV9mb3JtRWxlbWVudHM7CiAgICAgUUZpbGUqIG1fY3VycmVudEZp bGU7CiAgICAgcWludDY0IG1fY3VycmVudERlbHRhOworICAgIHFpbnQ2NCBtX2ZpbGVTaXplOwor ICAgIHFpbnQ2NCBtX2RhdGFTaXplOwogfTsKIAogfQo=