107031 2013-01-16 10:17:47 -0800 [Qt][WK2] Pages / resources cannot be loaded from qrc files. 2013-01-24 04:26:54 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103747 1 michael.bruning michael.bruning abecsi benjamin cmarcelo hausmann jturcotte menard webkit.review.bot oldest_to_newest 808492 0 michael.bruning 2013-01-16 10:17:47 -0800 Subject says most. This is an issue when someone would like e.g. to package a default page as part of the resources or package an offline page for a web app. 810517 1 183435 michael.bruning 2013-01-18 05:57:44 -0800 Created attachment 183435 Patch 812958 2 183435 abecsi 2013-01-22 05:33:34 -0800 Comment on attachment 183435 Patch LGTM. Note that this makes it possible to fix: https://bugreports.qt-project.org/browse/QTWEBKIT-388 and is blocking https://codereview.qt-project.org/#change,45329 813014 3 183435 hausmann 2013-01-22 07:01:22 -0800 Comment on attachment 183435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183435&action=review > Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h:68 > + QFile m_file; > + QFileInfo m_fileInfo; I suggest to make these to variables local to readResourceAndSend(). > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1354 > + QString qrcString = QStringLiteral("qrc"); > + if (!qrcString.compare(QString(req->data().m_scheme), Qt::CaseInsensitive)) { I think you can eliminate the QString conversions and the local qrcString variable by simply writing: if (req->data().m_scheme.startsWith("qrc", /*case sensitive: */false)) { WTFString appears to have a nice templatized ASCII fast-path for startsWith. 813019 4 183435 jturcotte 2013-01-22 07:08:16 -0800 Comment on attachment 183435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183435&action=review > Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h:68 > + QFile m_file; > + QFileInfo m_fileInfo; I think those two could be local variables in readResourceAndSend. > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1354 > + QString qrcString = QStringLiteral("qrc"); > + if (!qrcString.compare(QString(req->data().m_scheme), Qt::CaseInsensitive)) { QString::compare has a QLatin1String overload, so I think you could avoid the temporary variable by doing something like QString(req->data().m_scheme).compare(QLatin1String("qrc"),...) 813020 5 jturcotte 2013-01-22 07:09:09 -0800 (In reply to comment #4) Humm, that was pretty useless :P 813023 6 michael.bruning 2013-01-22 07:32:41 -0800 (In reply to comment #5) > (In reply to comment #4) > Humm, that was pretty useless :P As you both agree, it must be right ;) 813057 7 183993 michael.bruning 2013-01-22 08:30:06 -0800 Created attachment 183993 Patch 814134 8 183993 jturcotte 2013-01-23 05:39:21 -0800 Comment on attachment 183993 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183993&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:331 > + webPageProxy->registerApplicationScheme(QStringLiteral("qrc")); This ones takes a String, so it would be better to use ASCIILiteral("qrc"). > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1316 > + if (!scheme->scheme().compare(QStringLiteral("qrc"), Qt::CaseInsensitive)) { Nitpick: I think that you can use QLatin1String instead of QStringLiteral and avoid the QString construction here since there is a QString::compare(QLatin1String&...) overload. For the amount of times that this method would be called though, it doesn't matter, so feel free to ignore. > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1317 > + qWarning("WARNING: The qrc scheme is reserved to be handled internally. Handler will be ignored."); "Handlers" or "The handler" (I think) > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1318 > + scheme->setParent(0); I think that QObject::~QObject will take care of it. It's when we are about to delete a parent that we have to unparent the children since they would be deleted. 814155 9 184218 michael.bruning 2013-01-23 06:25:08 -0800 Created attachment 184218 Patch 814158 10 jturcotte 2013-01-23 06:34:19 -0800 LGTM. CCing Benjamin since somebody needs to stamp this as per the "At this point, we ask that all completely non-trivial patches be reviewed by an owner, even if in port specific code" directive. 814180 11 184218 hausmann 2013-01-23 07:23:59 -0800 Comment on attachment 184218 Patch What about a unit test? :) 814218 12 184238 michael.bruning 2013-01-23 08:02:37 -0800 Created attachment 184238 Patch 814219 13 184238 michael.bruning 2013-01-23 08:04:12 -0800 Comment on attachment 184238 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184238&action=review > Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:122 > + Sorry for the extra whitespace, I'll remove it when landing. 814593 14 184238 benjamin 2013-01-23 13:49:42 -0800 Comment on attachment 184238 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184238&action=review I sign off on this for WK2. Feel free to r+ if the patch is correct. > Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate.cpp:29 > #include "qquicknetworkreply_p.h" > #include "qquicknetworkrequest_p.h" > +#include <QMimeDatabase> > +#include <QtCore/QFile> > +#include <QtCore/QFileInfo> > +#include <QtCore/QUrl> include order? 815315 15 184460 michael.bruning 2013-01-24 04:10:01 -0800 Created attachment 184460 Patch 815317 16 184460 jturcotte 2013-01-24 04:19:51 -0800 Comment on attachment 184460 Patch Amazing. 815322 17 michael.bruning 2013-01-24 04:26:54 -0800 Committed r140676: <http://trac.webkit.org/changeset/140676> 183435 2013-01-18 05:57:44 -0800 2013-01-22 08:30:03 -0800 Patch bug-107031-20130118145443.patch text/plain 5315 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmE0ZWE4NTFhYWMwOTA0 OTFkZDgxZTQxNWExZGU3MTU0Yzg0MmM1ZS4uNzE5MDMyYzlkYTdlNDQ3YzExN2IwYzIwNjgzZjAy Y2Q0NzczNzE4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTE4ICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gUGFnZXMgLyByZXNvdXJjZXMgY2Fubm90IGJlIGxvYWRlZCBmcm9tIHFyYyBmaWxlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzAzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZXMg V2ViS2l0MiBRdCBhcHBsaWNhdGlvbnMgdG8gbG9hZCBmaWxlcyBmcm9tIHRoZSBidW5kbGVkCisg ICAgICAgIHFyYyBmaWxlcy4gVGhpcyBpcyBhY2hpZXZlZCBieSBhZGRpbmcgYSB1cmwgc2NoZW1l IGhhbmRsZXIgZm9yCisgICAgICAgIHRoZSAicXJjIiBzY2hlbWUgdXNpbmcgdGhlIGFwcGxpY2F0 aW9uIHNjaGVtZSBoYW5kbGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1 cmxzY2hlbWVkZWxlZ2F0ZS5jcHA6CisgICAgICAgIChRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZTo6 UVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUpOgorICAgICAgICAoUVF1aWNrUXJjU2NoZW1lRGVsZWdh dGU6OnJlYWRSZXNvdXJjZUFuZFNlbmQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrdXJsc2NoZW1lZGVsZWdhdGVfcC5oOgorICAgICAgICAoUVF1aWNrUXJjU2NoZW1lRGVsZWdh dGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAg ICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3RXhwZXJpbWVudGFsOjppbnZva2VBcHBsaWNhdGlvblNjaGVtZUhhbmRsZXIpOgorCiAy MDEzLTAxLTE4ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAg ICAgICAgIENvb3JkaW5hdGVkIEdyYXBoaWNzOiBDb29yZGluYXRlZFRpbGU6OnVwZGF0ZUJhY2tC dWZmZXIoKSByZXR1cm5zIGEgZGlydHkgcmVjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGUuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZS5jcHAKaW5kZXgg ZTVkNjMwNDNiZjA5NWEwYjg4NTIwYTQ3OGZlOGJjNDdlMzg2NDAxYy4uOTBkZGY3NzBhNjYxYWVm NjJkN2U3MWY5OWRhNzQwNWYzMTEyOWY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZS5jcHAKQEAgLTIz LDYgKzIzLDcgQEAKIAogI2luY2x1ZGUgInFxdWlja25ldHdvcmtyZXBseV9wLmgiCiAjaW5jbHVk ZSAicXF1aWNrbmV0d29ya3JlcXVlc3RfcC5oIgorI2luY2x1ZGUgPFFNaW1lRGF0YWJhc2U+CiAK IFFRdWlja1VybFNjaGVtZURlbGVnYXRlOjpRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZShRT2JqZWN0 KiBwYXJlbnQpCiAgICAgOiBRT2JqZWN0KHBhcmVudCkKQEAgLTUxLDQgKzUyLDI2IEBAIFFRdWlj a05ldHdvcmtSZXBseSogUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGU6OnJlcGx5KCkgY29uc3QKICAg ICByZXR1cm4gbV9yZXBseTsKIH0KIAorUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGU6OlFRdWlja1Fy Y1NjaGVtZURlbGVnYXRlKGNvbnN0IFFVcmwmIHVybCkKKyAgICA6IFFRdWlja1VybFNjaGVtZURl bGVnYXRlKCkKKyAgICAsIG1fZmlsZU5hbWUoUUxhdGluMUNoYXIoJzonKSArIHVybC5wYXRoKCkp CisgICAgLCBtX2ZpbGUobV9maWxlTmFtZSkKKyAgICAsIG1fZmlsZUluZm8obV9maWxlTmFtZSkK K3sKK30KKwordm9pZCBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZTo6cmVhZFJlc291cmNlQW5kU2Vu ZCgpCit7CisgICAgaWYgKG1fZmlsZUluZm8uaXNEaXIoKSB8fCAhbV9maWxlLm9wZW4oUUlPRGV2 aWNlOjpSZWFkT25seSB8IFFJT0RldmljZTo6VW5idWZmZXJlZCkpCisgICAgICAgIHJldHVybjsK KyAgICBRQnl0ZUFycmF5IGZpbGVEYXRhKG1fZmlsZS5yZWFkQWxsKCkpOworICAgIFFNaW1lRGF0 YWJhc2UgbWltZURiOworICAgIFFNaW1lVHlwZSBtaW1lVHlwZSA9IG1pbWVEYi5taW1lVHlwZUZv ckZpbGVOYW1lQW5kRGF0YShtX2ZpbGVOYW1lLCBmaWxlRGF0YSk7CisgICAgbV9maWxlLmNsb3Nl KCk7CisKKyAgICByZXBseSgpLT5zZXREYXRhKGZpbGVEYXRhKTsKKyAgICByZXBseSgpLT5zZXRD b250ZW50VHlwZShtaW1lVHlwZS5uYW1lKCkpOworICAgIHJlcGx5KCktPnNlbmQoKTsKK30KKwog I2luY2x1ZGUgIm1vY19xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmNwcCIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGVf cC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxl Z2F0ZV9wLmgKaW5kZXggNmVlNjAyNzU0ZTZhMzhiODhmZTEwZWJkMTU0MTcwMGRiOGQzMmZlOS4u M2M2Mjc2OTQ1YzJjNDcyMzI0NTllOTQ2NTg0MThlNGFiNjhjYjYwMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxl Z2F0ZV9wLmgKQEAgLTIzLDYgKzIzLDkgQEAKIAogI2luY2x1ZGUgInF3ZWJraXRnbG9iYWwuaCIK ICNpbmNsdWRlIDxRT2JqZWN0PgorI2luY2x1ZGUgPFF0Q29yZS9RRmlsZT4KKyNpbmNsdWRlIDxR dENvcmUvUUZpbGVJbmZvPgorI2luY2x1ZGUgPFF0Q29yZS9RVXJsPgogI2luY2x1ZGUgPFF0UXVp Y2svcXF1aWNraXRlbS5oPgogCiBjbGFzcyBRUXVpY2tOZXR3b3JrUmVxdWVzdDsKQEAgLTUzLDYg KzU2LDE4IEBAIHByaXZhdGU6CiAKIFFNTF9ERUNMQVJFX1RZUEUoUVF1aWNrVXJsU2NoZW1lRGVs ZWdhdGUpCiAKK2NsYXNzIFFRdWlja1FyY1NjaGVtZURlbGVnYXRlIDogcHVibGljIFFRdWlja1Vy bFNjaGVtZURlbGVnYXRlIHsKKyAgICBRX09CSkVDVAorcHVibGljOgorICAgIFFRdWlja1FyY1Nj aGVtZURlbGVnYXRlKGNvbnN0IFFVcmwmIHVybCk7CisgICAgdm9pZCByZWFkUmVzb3VyY2VBbmRT ZW5kKCk7CisKK3ByaXZhdGU6CisgICAgUVN0cmluZyBtX2ZpbGVOYW1lOworICAgIFFGaWxlIG1f ZmlsZTsKKyAgICBRRmlsZUluZm8gbV9maWxlSW5mbzsKK307CisKICNlbmRpZiAvLyBxcXVpY2t1 cmxzY2hlbWVkZWxlZ2F0ZV9wX2gKIAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCAyMDUzMDc5YjBiNDJlY2ViODE4MmJkMGE4 ZTY2NzI4YzU5OTE5ZTMyLi45YjcyNjNjZWExZjQyNjQwOTg3ZTA2MjYyYTIyMDk2YjU5MTUyMzhi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmll dy5jcHAKQEAgLTMyOCw2ICszMjgsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0 aWFsaXplKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYQogCiAgICAg cGFnZUNsaWVudC5pbml0aWFsaXplKHFfcHRyLCBwYWdlVmlld1ByaXZhdGUtPmV2ZW50SGFuZGxl ci5kYXRhKCksICZ1bmRvQ29udHJvbGxlcik7CiAgICAgd2ViUGFnZVByb3h5LT5pbml0aWFsaXpl V2ViUGFnZSgpOworICAgIHdlYlBhZ2VQcm94eS0+cmVnaXN0ZXJBcHBsaWNhdGlvblNjaGVtZShR U3RyaW5nTGl0ZXJhbCgicXJjIikpOwogCiAgICAgcV9wdHItPnNldEFjY2VwdGVkTW91c2VCdXR0 b25zKFF0OjpNb3VzZUJ1dHRvbk1hc2spOwogICAgIHFfcHRyLT5zZXRBY2NlcHRIb3ZlckV2ZW50 cyh0cnVlKTsKQEAgLTEzNDksNiArMTM1MCwxNiBAQCBRUW1sTGlzdFByb3BlcnR5PFFRdWlja1Vy bFNjaGVtZURlbGVnYXRlPiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzY2hlbWVEZWxlZwog dm9pZCBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjppbnZva2VBcHBsaWNhdGlvblNjaGVtZUhh bmRsZXIoUGFzc1JlZlB0cjxRdFJlZkNvdW50ZWROZXR3b3JrUmVxdWVzdERhdGE+IHJlcXVlc3Qp CiB7CiAgICAgUmVmUHRyPFF0UmVmQ291bnRlZE5ldHdvcmtSZXF1ZXN0RGF0YT4gcmVxID0gcmVx dWVzdDsKKyAgICBRU3RyaW5nIHFyY1N0cmluZyA9IFFTdHJpbmdMaXRlcmFsKCJxcmMiKTsKKyAg ICBpZiAoIXFyY1N0cmluZy5jb21wYXJlKFFTdHJpbmcocmVxLT5kYXRhKCkubV9zY2hlbWUpLCBR dDo6Q2FzZUluc2Vuc2l0aXZlKSkgeworICAgICAgICBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZSBx cmNEZWxlZ2F0ZShRVXJsKFFTdHJpbmcocmVxLT5kYXRhKCkubV91cmxTdHJpbmcpKSk7CisgICAg ICAgIHFyY0RlbGVnYXRlLnJlcXVlc3QoKS0+c2V0TmV0d29ya1JlcXVlc3REYXRhKHJlcSk7Cisg ICAgICAgIHFyY0RlbGVnYXRlLnJlcGx5KCktPnNldE5ldHdvcmtSZXF1ZXN0RGF0YShyZXEpOwor ICAgICAgICBxcmNEZWxlZ2F0ZS5yZXBseSgpLT5zZXRXZWJWaWV3RXhwZXJpbWVudGFsKHRoaXMp OworICAgICAgICBxcmNEZWxlZ2F0ZS5yZWFkUmVzb3VyY2VBbmRTZW5kKCk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKICAgICBjb25zdCBRT2JqZWN0TGlzdCBjaGlsZHJlbiA9IHNjaGVtZVBh cmVudC0+Y2hpbGRyZW4oKTsKICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwgY2hpbGRy ZW4uY291bnQoKTsgaW5kZXgrKykgewogICAgICAgICBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSog ZGVsZWdhdGUgPSBxb2JqZWN0X2Nhc3Q8UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUqPihjaGlsZHJl bi5hdChpbmRleCkpOwo= 183993 2013-01-22 08:30:06 -0800 2013-01-23 06:25:05 -0800 Patch bug-107031-20130122172700.patch text/plain 6107 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTVlMzI1Y2U1Yzc0ZmM3 YzJjMDE3MWRlZWQyYzI1MTBhMDA4N2RkMS4uZDc2MDRkNzYzZWFiNmI2ZTlkZjM4ZDcxYWMyNGQ0 YmEyYzVhZDBkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIyICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gUGFnZXMgLyByZXNvdXJjZXMgY2Fubm90IGJlIGxvYWRlZCBmcm9tIHFyYyBmaWxlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzAzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZXMg V2ViS2l0MiBRdCBhcHBsaWNhdGlvbnMgdG8gbG9hZCBmaWxlcyBmcm9tIHRoZSBidW5kbGVkCisg ICAgICAgIHFyYyBmaWxlcy4gVGhpcyBpcyBhY2hpZXZlZCBieSBhZGRpbmcgYSB1cmwgc2NoZW1l IGhhbmRsZXIgZm9yCisgICAgICAgIHRoZSAicXJjIiBzY2hlbWUgdXNpbmcgdGhlIGFwcGxpY2F0 aW9uIHNjaGVtZSBoYW5kbGVyIGFuZCBpZ25vcmluZworICAgICAgICBhbGwgaGFuZGxlcnMgZm9y IHRoZSBxcmMgYXBwbGljYXRpb24gc2NoZW1lIHRoYXQgdGhlIGFwcGxpY2F0aW9uIG1pZ2h0Cisg ICAgICAgIHNldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1l ZGVsZWdhdGUuY3BwOgorICAgICAgICAoUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGU6OlFRdWlja1Fy Y1NjaGVtZURlbGVnYXRlKToKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlOjpyZWFk UmVzb3VyY2VBbmRTZW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNj aGVtZWRlbGVnYXRlX3AuaDoKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld0V4 cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVuZCk6CisgICAgICAgIChRUXVpY2tXZWJW aWV3RXhwZXJpbWVudGFsOjppbnZva2VBcHBsaWNhdGlvblNjaGVtZUhhbmRsZXIpOgorCiAyMDEz LTAxLTIyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAg IFBERlBsdWdpbjogQnVpbGQgUERGUGx1Z2luIGV2ZXJ5d2hlcmUsIGVuYWJsZSBhdCBydW50aW1l CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNj aGVtZWRlbGVnYXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr dXJsc2NoZW1lZGVsZWdhdGUuY3BwCmluZGV4IGU1ZDYzMDQzYmYwOTVhMGI4ODUyMGE0NzhmZThi YzQ3ZTM4NjQwMWMuLjYwNjIxNzViZjI3M2FmNzZhNTkyYmRhODYxNzJlZjM3NzU0Mjk2MGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1l ZGVsZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr dXJsc2NoZW1lZGVsZWdhdGUuY3BwCkBAIC0yMyw2ICsyMywxMCBAQAogCiAjaW5jbHVkZSAicXF1 aWNrbmV0d29ya3JlcGx5X3AuaCIKICNpbmNsdWRlICJxcXVpY2tuZXR3b3JrcmVxdWVzdF9wLmgi CisjaW5jbHVkZSA8UU1pbWVEYXRhYmFzZT4KKyNpbmNsdWRlIDxRdENvcmUvUUZpbGU+CisjaW5j bHVkZSA8UXRDb3JlL1FGaWxlSW5mbz4KKyNpbmNsdWRlIDxRdENvcmUvUVVybD4KIAogUVF1aWNr VXJsU2NoZW1lRGVsZWdhdGU6OlFRdWlja1VybFNjaGVtZURlbGVnYXRlKFFPYmplY3QqIHBhcmVu dCkKICAgICA6IFFPYmplY3QocGFyZW50KQpAQCAtNTEsNCArNTUsMjcgQEAgUVF1aWNrTmV0d29y a1JlcGx5KiBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZTo6cmVwbHkoKSBjb25zdAogICAgIHJldHVy biBtX3JlcGx5OwogfQogCitRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZTo6UVF1aWNrUXJjU2NoZW1l RGVsZWdhdGUoY29uc3QgUVVybCYgdXJsKQorICAgIDogUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUo KQorICAgICwgbV9maWxlTmFtZShRTGF0aW4xQ2hhcignOicpICsgdXJsLnBhdGgoKSkKK3sKK30K Kwordm9pZCBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZTo6cmVhZFJlc291cmNlQW5kU2VuZCgpCit7 CisgICAgUUZpbGUgZmlsZShtX2ZpbGVOYW1lKTsKKyAgICBRRmlsZUluZm8gZmlsZUluZm8oZmls ZSk7CisgICAgaWYgKGZpbGVJbmZvLmlzRGlyKCkgfHwgIWZpbGUub3BlbihRSU9EZXZpY2U6OlJl YWRPbmx5IHwgUUlPRGV2aWNlOjpVbmJ1ZmZlcmVkKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg UUJ5dGVBcnJheSBmaWxlRGF0YShmaWxlLnJlYWRBbGwoKSk7CisgICAgUU1pbWVEYXRhYmFzZSBt aW1lRGI7CisgICAgUU1pbWVUeXBlIG1pbWVUeXBlID0gbWltZURiLm1pbWVUeXBlRm9yRmlsZU5h bWVBbmREYXRhKG1fZmlsZU5hbWUsIGZpbGVEYXRhKTsKKyAgICBmaWxlLmNsb3NlKCk7CisKKyAg ICByZXBseSgpLT5zZXREYXRhKGZpbGVEYXRhKTsKKyAgICByZXBseSgpLT5zZXRDb250ZW50VHlw ZShtaW1lVHlwZS5uYW1lKCkpOworICAgIHJlcGx5KCktPnNlbmQoKTsKK30KKwogI2luY2x1ZGUg Im1vY19xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmNwcCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGVfcC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgK aW5kZXggNmVlNjAyNzU0ZTZhMzhiODhmZTEwZWJkMTU0MTcwMGRiOGQzMmZlOS4uMDg3Y2IyOWI3 NDdkNTI2MTBhMzEzYTk4YzAzZjRlZjA0NWJhMDY3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgK QEAgLTI3LDYgKzI3LDcgQEAKIAogY2xhc3MgUVF1aWNrTmV0d29ya1JlcXVlc3Q7CiBjbGFzcyBR UXVpY2tOZXR3b3JrUmVwbHk7CitjbGFzcyBRVXJsOwogCiBjbGFzcyBRV0VCS0lUX0VYUE9SVCBR UXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVApA QCAtNTMsNiArNTQsMTYgQEAgcHJpdmF0ZToKIAogUU1MX0RFQ0xBUkVfVFlQRShRUXVpY2tVcmxT Y2hlbWVEZWxlZ2F0ZSkKIAorY2xhc3MgUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUgOiBwdWJsaWMg UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUgeworICAgIFFfT0JKRUNUCitwdWJsaWM6CisgICAgUVF1 aWNrUXJjU2NoZW1lRGVsZWdhdGUoY29uc3QgUVVybCYgdXJsKTsKKyAgICB2b2lkIHJlYWRSZXNv dXJjZUFuZFNlbmQoKTsKKworcHJpdmF0ZToKKyAgICBRU3RyaW5nIG1fZmlsZU5hbWU7Cit9Owor CiAjZW5kaWYgLy8gcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGVfcF9oCiAKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggMjA1MzA3 OWIwYjQyZWNlYjgxODJiZDBhOGU2NjcyOGM1OTkxOWUzMi4uMjA4MjM3MjY1MzNiYWU4ZTk4MzFm ZWM1MjkxZDJhYTljNDYxNTEwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0zMjgsNiArMzI4LDcgQEAgdm9pZCBRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdl R3JvdXBSZWYgcGEKIAogICAgIHBhZ2VDbGllbnQuaW5pdGlhbGl6ZShxX3B0ciwgcGFnZVZpZXdQ cml2YXRlLT5ldmVudEhhbmRsZXIuZGF0YSgpLCAmdW5kb0NvbnRyb2xsZXIpOwogICAgIHdlYlBh Z2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB3ZWJQYWdlUHJveHktPnJlZ2lzdGVy QXBwbGljYXRpb25TY2hlbWUoUVN0cmluZ0xpdGVyYWwoInFyYyIpKTsKIAogICAgIHFfcHRyLT5z ZXRBY2NlcHRlZE1vdXNlQnV0dG9ucyhRdDo6TW91c2VCdXR0b25NYXNrKTsKICAgICBxX3B0ci0+ c2V0QWNjZXB0SG92ZXJFdmVudHModHJ1ZSk7CkBAIC0xMzEyLDYgKzEzMTMsMTMgQEAgUVF1aWNr VXJsU2NoZW1lRGVsZWdhdGUqIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OnNjaGVtZURlbGVn YXRlc19BdChRUW1sTGlzdFAKIAogdm9pZCBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzY2hl bWVEZWxlZ2F0ZXNfQXBwZW5kKFFRbWxMaXN0UHJvcGVydHk8UVF1aWNrVXJsU2NoZW1lRGVsZWdh dGU+KiBwcm9wZXJ0eSwgUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUgKnNjaGVtZSkKIHsKKyAgICBp ZiAoIXNjaGVtZS0+c2NoZW1lKCkuY29tcGFyZShRU3RyaW5nTGl0ZXJhbCgicXJjIiksIFF0OjpD YXNlSW5zZW5zaXRpdmUpKSB7CisgICAgICAgIHFXYXJuaW5nKCJXQVJOSU5HOiBUaGUgcXJjIHNj aGVtZSBpcyByZXNlcnZlZCB0byBiZSBoYW5kbGVkIGludGVybmFsbHkuIEhhbmRsZXIgd2lsbCBi ZSBpZ25vcmVkLiIpOworICAgICAgICBzY2hlbWUtPnNldFBhcmVudCgwKTsKKyAgICAgICAgZGVs ZXRlIHNjaGVtZTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFFPYmplY3QqIHNjaGVt ZVBhcmVudCA9IHByb3BlcnR5LT5vYmplY3Q7CiAgICAgc2NoZW1lLT5zZXRQYXJlbnQoc2NoZW1l UGFyZW50KTsKICAgICBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKiB3ZWJWaWV3RXhwZXJpbWVu dGFsID0gcW9iamVjdF9jYXN0PFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwqPihwcm9wZXJ0eS0+ b2JqZWN0LT5wYXJlbnQoKSk7CkBAIC0xMzQ5LDYgKzEzNTcsMTUgQEAgUVFtbExpc3RQcm9wZXJ0 eTxRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZT4gUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2No ZW1lRGVsZWcKIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6aW52b2tlQXBwbGljYXRp b25TY2hlbWVIYW5kbGVyKFBhc3NSZWZQdHI8UXRSZWZDb3VudGVkTmV0d29ya1JlcXVlc3REYXRh PiByZXF1ZXN0KQogewogICAgIFJlZlB0cjxRdFJlZkNvdW50ZWROZXR3b3JrUmVxdWVzdERhdGE+ IHJlcSA9IHJlcXVlc3Q7CisgICAgaWYgKHJlcS0+ZGF0YSgpLm1fc2NoZW1lLnN0YXJ0c1dpdGgo InFyYyIsIGZhbHNlKSkgeworICAgICAgICBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZSBxcmNEZWxl Z2F0ZShRVXJsKFFTdHJpbmcocmVxLT5kYXRhKCkubV91cmxTdHJpbmcpKSk7CisgICAgICAgIHFy Y0RlbGVnYXRlLnJlcXVlc3QoKS0+c2V0TmV0d29ya1JlcXVlc3REYXRhKHJlcSk7CisgICAgICAg IHFyY0RlbGVnYXRlLnJlcGx5KCktPnNldE5ldHdvcmtSZXF1ZXN0RGF0YShyZXEpOworICAgICAg ICBxcmNEZWxlZ2F0ZS5yZXBseSgpLT5zZXRXZWJWaWV3RXhwZXJpbWVudGFsKHRoaXMpOworICAg ICAgICBxcmNEZWxlZ2F0ZS5yZWFkUmVzb3VyY2VBbmRTZW5kKCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBjb25zdCBRT2JqZWN0TGlzdCBjaGlsZHJlbiA9IHNjaGVtZVBhcmVudC0+ Y2hpbGRyZW4oKTsKICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwgY2hpbGRyZW4uY291 bnQoKTsgaW5kZXgrKykgewogICAgICAgICBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSogZGVsZWdh dGUgPSBxb2JqZWN0X2Nhc3Q8UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUqPihjaGlsZHJlbi5hdChp bmRleCkpOwo= 184218 2013-01-23 06:25:08 -0800 2013-01-23 08:02:33 -0800 Patch bug-107031-20130123152201.patch text/plain 6062 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWQ2MmQ5ZjAzNjJkNTZi ODJkMWUzYTFkMTJkZGM5NWQ2MTQ0MGVhNy4uM2QxZmRiNjZjNDhmYzQxOTNjZmY2ZDMwNWJiYWVi N2UxNDU2YWI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIzICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gUGFnZXMgLyByZXNvdXJjZXMgY2Fubm90IGJlIGxvYWRlZCBmcm9tIHFyYyBmaWxlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzAzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZXMg V2ViS2l0MiBRdCBhcHBsaWNhdGlvbnMgdG8gbG9hZCBmaWxlcyBmcm9tIHRoZSBidW5kbGVkCisg ICAgICAgIHFyYyBmaWxlcy4gVGhpcyBpcyBhY2hpZXZlZCBieSBhZGRpbmcgYSB1cmwgc2NoZW1l IGhhbmRsZXIgZm9yCisgICAgICAgIHRoZSAicXJjIiBzY2hlbWUgdXNpbmcgdGhlIGFwcGxpY2F0 aW9uIHNjaGVtZSBoYW5kbGVyIGFuZCBpZ25vcmluZworICAgICAgICBhbGwgaGFuZGxlcnMgZm9y IHRoZSBxcmMgYXBwbGljYXRpb24gc2NoZW1lIHRoYXQgdGhlIGFwcGxpY2F0aW9uIG1pZ2h0Cisg ICAgICAgIHNldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1l ZGVsZWdhdGUuY3BwOgorICAgICAgICAoUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGU6OlFRdWlja1Fy Y1NjaGVtZURlbGVnYXRlKToKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlOjpyZWFk UmVzb3VyY2VBbmRTZW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNj aGVtZWRlbGVnYXRlX3AuaDoKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld0V4 cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVuZCk6CisgICAgICAgIChRUXVpY2tXZWJW aWV3RXhwZXJpbWVudGFsOjppbnZva2VBcHBsaWNhdGlvblNjaGVtZUhhbmRsZXIpOgorCiAyMDEz LTAxLTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg VXNlIGEgcGxhdGZvcm9tIHN0cmF0ZWd5IGZvciBsb2NhbCBzdG9yYWdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNjaGVtZWRlbGVnYXRlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdh dGUuY3BwCmluZGV4IGU1ZDYzMDQzYmYwOTVhMGI4ODUyMGE0NzhmZThiYzQ3ZTM4NjQwMWMuLjYw NjIxNzViZjI3M2FmNzZhNTkyYmRhODYxNzJlZjM3NzU0Mjk2MGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdh dGUuY3BwCkBAIC0yMyw2ICsyMywxMCBAQAogCiAjaW5jbHVkZSAicXF1aWNrbmV0d29ya3JlcGx5 X3AuaCIKICNpbmNsdWRlICJxcXVpY2tuZXR3b3JrcmVxdWVzdF9wLmgiCisjaW5jbHVkZSA8UU1p bWVEYXRhYmFzZT4KKyNpbmNsdWRlIDxRdENvcmUvUUZpbGU+CisjaW5jbHVkZSA8UXRDb3JlL1FG aWxlSW5mbz4KKyNpbmNsdWRlIDxRdENvcmUvUVVybD4KIAogUVF1aWNrVXJsU2NoZW1lRGVsZWdh dGU6OlFRdWlja1VybFNjaGVtZURlbGVnYXRlKFFPYmplY3QqIHBhcmVudCkKICAgICA6IFFPYmpl Y3QocGFyZW50KQpAQCAtNTEsNCArNTUsMjcgQEAgUVF1aWNrTmV0d29ya1JlcGx5KiBRUXVpY2tV cmxTY2hlbWVEZWxlZ2F0ZTo6cmVwbHkoKSBjb25zdAogICAgIHJldHVybiBtX3JlcGx5OwogfQog CitRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZTo6UVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUoY29uc3Qg UVVybCYgdXJsKQorICAgIDogUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUoKQorICAgICwgbV9maWxl TmFtZShRTGF0aW4xQ2hhcignOicpICsgdXJsLnBhdGgoKSkKK3sKK30KKwordm9pZCBRUXVpY2tR cmNTY2hlbWVEZWxlZ2F0ZTo6cmVhZFJlc291cmNlQW5kU2VuZCgpCit7CisgICAgUUZpbGUgZmls ZShtX2ZpbGVOYW1lKTsKKyAgICBRRmlsZUluZm8gZmlsZUluZm8oZmlsZSk7CisgICAgaWYgKGZp bGVJbmZvLmlzRGlyKCkgfHwgIWZpbGUub3BlbihRSU9EZXZpY2U6OlJlYWRPbmx5IHwgUUlPRGV2 aWNlOjpVbmJ1ZmZlcmVkKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUUJ5dGVBcnJheSBmaWxl RGF0YShmaWxlLnJlYWRBbGwoKSk7CisgICAgUU1pbWVEYXRhYmFzZSBtaW1lRGI7CisgICAgUU1p bWVUeXBlIG1pbWVUeXBlID0gbWltZURiLm1pbWVUeXBlRm9yRmlsZU5hbWVBbmREYXRhKG1fZmls ZU5hbWUsIGZpbGVEYXRhKTsKKyAgICBmaWxlLmNsb3NlKCk7CisKKyAgICByZXBseSgpLT5zZXRE YXRhKGZpbGVEYXRhKTsKKyAgICByZXBseSgpLT5zZXRDb250ZW50VHlwZShtaW1lVHlwZS5uYW1l KCkpOworICAgIHJlcGx5KCktPnNlbmQoKTsKK30KKwogI2luY2x1ZGUgIm1vY19xcXVpY2t1cmxz Y2hlbWVkZWxlZ2F0ZV9wLmNwcCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGVfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKaW5kZXggNmVlNjAyNzU0 ZTZhMzhiODhmZTEwZWJkMTU0MTcwMGRiOGQzMmZlOS4uMDg3Y2IyOWI3NDdkNTI2MTBhMzEzYTk4 YzAzZjRlZjA0NWJhMDY3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKQEAgLTI3LDYgKzI3LDcg QEAKIAogY2xhc3MgUVF1aWNrTmV0d29ya1JlcXVlc3Q7CiBjbGFzcyBRUXVpY2tOZXR3b3JrUmVw bHk7CitjbGFzcyBRVXJsOwogCiBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRUXVpY2tVcmxTY2hlbWVE ZWxlZ2F0ZSA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVApAQCAtNTMsNiArNTQsMTYg QEAgcHJpdmF0ZToKIAogUU1MX0RFQ0xBUkVfVFlQRShRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSkK IAorY2xhc3MgUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUgOiBwdWJsaWMgUVF1aWNrVXJsU2NoZW1l RGVsZWdhdGUgeworICAgIFFfT0JKRUNUCitwdWJsaWM6CisgICAgUVF1aWNrUXJjU2NoZW1lRGVs ZWdhdGUoY29uc3QgUVVybCYgdXJsKTsKKyAgICB2b2lkIHJlYWRSZXNvdXJjZUFuZFNlbmQoKTsK KworcHJpdmF0ZToKKyAgICBRU3RyaW5nIG1fZmlsZU5hbWU7Cit9OworCiAjZW5kaWYgLy8gcXF1 aWNrdXJsc2NoZW1lZGVsZWdhdGVfcF9oCiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggMjA1MzA3OWIwYjQyZWNlYjgxODJi ZDBhOGU2NjcyOGM1OTkxOWUzMi4uOWU5ZmU5NWE3NDA0M2YyZDcxODc1MWFhYTQzZGNkM2Y4ZjQ4 ZmUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXcuY3BwCkBAIC0zMjgsNiArMzI4LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6 aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGEKIAog ICAgIHBhZ2VDbGllbnQuaW5pdGlhbGl6ZShxX3B0ciwgcGFnZVZpZXdQcml2YXRlLT5ldmVudEhh bmRsZXIuZGF0YSgpLCAmdW5kb0NvbnRyb2xsZXIpOwogICAgIHdlYlBhZ2VQcm94eS0+aW5pdGlh bGl6ZVdlYlBhZ2UoKTsKKyAgICB3ZWJQYWdlUHJveHktPnJlZ2lzdGVyQXBwbGljYXRpb25TY2hl bWUoQVNDSUlMaXRlcmFsKCJxcmMiKSk7CiAKICAgICBxX3B0ci0+c2V0QWNjZXB0ZWRNb3VzZUJ1 dHRvbnMoUXQ6Ok1vdXNlQnV0dG9uTWFzayk7CiAgICAgcV9wdHItPnNldEFjY2VwdEhvdmVyRXZl bnRzKHRydWUpOwpAQCAtMTMxMiw2ICsxMzEzLDEyIEBAIFFRdWlja1VybFNjaGVtZURlbGVnYXRl KiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzY2hlbWVEZWxlZ2F0ZXNfQXQoUVFtbExpc3RQ CiAKIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVu ZChRUW1sTGlzdFByb3BlcnR5PFFRdWlja1VybFNjaGVtZURlbGVnYXRlPiogcHJvcGVydHksIFFR dWlja1VybFNjaGVtZURlbGVnYXRlICpzY2hlbWUpCiB7CisgICAgaWYgKCFzY2hlbWUtPnNjaGVt ZSgpLmNvbXBhcmUoUUxhdGluMVN0cmluZygicXJjIiksIFF0OjpDYXNlSW5zZW5zaXRpdmUpKSB7 CisgICAgICAgIHFXYXJuaW5nKCJXQVJOSU5HOiBUaGUgcXJjIHNjaGVtZSBpcyByZXNlcnZlZCB0 byBiZSBoYW5kbGVkIGludGVybmFsbHkuIFRoZSBoYW5kbGVyIHdpbGwgYmUgaWdub3JlZC4iKTsK KyAgICAgICAgZGVsZXRlIHNjaGVtZTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFFP YmplY3QqIHNjaGVtZVBhcmVudCA9IHByb3BlcnR5LT5vYmplY3Q7CiAgICAgc2NoZW1lLT5zZXRQ YXJlbnQoc2NoZW1lUGFyZW50KTsKICAgICBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKiB3ZWJW aWV3RXhwZXJpbWVudGFsID0gcW9iamVjdF9jYXN0PFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwq Pihwcm9wZXJ0eS0+b2JqZWN0LT5wYXJlbnQoKSk7CkBAIC0xMzQ5LDYgKzEzNTYsMTUgQEAgUVFt bExpc3RQcm9wZXJ0eTxRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZT4gUVF1aWNrV2ViVmlld0V4cGVy aW1lbnRhbDo6c2NoZW1lRGVsZWcKIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6aW52 b2tlQXBwbGljYXRpb25TY2hlbWVIYW5kbGVyKFBhc3NSZWZQdHI8UXRSZWZDb3VudGVkTmV0d29y a1JlcXVlc3REYXRhPiByZXF1ZXN0KQogewogICAgIFJlZlB0cjxRdFJlZkNvdW50ZWROZXR3b3Jr UmVxdWVzdERhdGE+IHJlcSA9IHJlcXVlc3Q7CisgICAgaWYgKHJlcS0+ZGF0YSgpLm1fc2NoZW1l LnN0YXJ0c1dpdGgoInFyYyIsIGZhbHNlKSkgeworICAgICAgICBRUXVpY2tRcmNTY2hlbWVEZWxl Z2F0ZSBxcmNEZWxlZ2F0ZShRVXJsKFFTdHJpbmcocmVxLT5kYXRhKCkubV91cmxTdHJpbmcpKSk7 CisgICAgICAgIHFyY0RlbGVnYXRlLnJlcXVlc3QoKS0+c2V0TmV0d29ya1JlcXVlc3REYXRhKHJl cSk7CisgICAgICAgIHFyY0RlbGVnYXRlLnJlcGx5KCktPnNldE5ldHdvcmtSZXF1ZXN0RGF0YShy ZXEpOworICAgICAgICBxcmNEZWxlZ2F0ZS5yZXBseSgpLT5zZXRXZWJWaWV3RXhwZXJpbWVudGFs KHRoaXMpOworICAgICAgICBxcmNEZWxlZ2F0ZS5yZWFkUmVzb3VyY2VBbmRTZW5kKCk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKICAgICBjb25zdCBRT2JqZWN0TGlzdCBjaGlsZHJlbiA9IHNj aGVtZVBhcmVudC0+Y2hpbGRyZW4oKTsKICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwg Y2hpbGRyZW4uY291bnQoKTsgaW5kZXgrKykgewogICAgICAgICBRUXVpY2tVcmxTY2hlbWVEZWxl Z2F0ZSogZGVsZWdhdGUgPSBxb2JqZWN0X2Nhc3Q8UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUqPihj aGlsZHJlbi5hdChpbmRleCkpOwo= 184238 2013-01-23 08:02:37 -0800 2013-01-24 04:09:58 -0800 Patch bug-107031-20130123165929.patch text/plain 8167 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWQ2MmQ5ZjAzNjJkNTZi ODJkMWUzYTFkMTJkZGM5NWQ2MTQ0MGVhNy4uMzk2MDU1NDFjMTJkM2UzYzkwZmUwYWI2ZjA1ZWJl OTg2MTY3OGU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAxLTIzICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gUGFnZXMgLyByZXNvdXJjZXMgY2Fubm90IGJlIGxvYWRlZCBmcm9tIHFyYyBmaWxlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzAzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZXMg V2ViS2l0MiBRdCBhcHBsaWNhdGlvbnMgdG8gbG9hZCBmaWxlcyBmcm9tIHRoZSBidW5kbGVkCisg ICAgICAgIHFyYyBmaWxlcy4gVGhpcyBpcyBhY2hpZXZlZCBieSBhZGRpbmcgYSB1cmwgc2NoZW1l IGhhbmRsZXIgZm9yCisgICAgICAgIHRoZSAicXJjIiBzY2hlbWUgdXNpbmcgdGhlIGFwcGxpY2F0 aW9uIHNjaGVtZSBoYW5kbGVyIGFuZCBpZ25vcmluZworICAgICAgICBhbGwgaGFuZGxlcnMgZm9y IHRoZSBxcmMgYXBwbGljYXRpb24gc2NoZW1lIHRoYXQgdGhlIGFwcGxpY2F0aW9uIG1pZ2h0Cisg ICAgICAgIHNldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1l ZGVsZWdhdGUuY3BwOgorICAgICAgICAoUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGU6OlFRdWlja1Fy Y1NjaGVtZURlbGVnYXRlKToKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlOjpyZWFk UmVzb3VyY2VBbmRTZW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNj aGVtZWRlbGVnYXRlX3AuaDoKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld0V4 cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVuZCk6CisgICAgICAgIChRUXVpY2tXZWJW aWV3RXhwZXJpbWVudGFsOjppbnZva2VBcHBsaWNhdGlvblNjaGVtZUhhbmRsZXIpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfYXBwbGljYXRp b25TY2hlbWUucW1sOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMv Y29tbW9uL3FyY3Rlc3QuaHRtbDogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90 ZXN0cy9xbWx0ZXN0cy9yZXNvdXJjZXMucXJjOgorCiAyMDEzLTAxLTIyICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIGEgcGxhdGZvcm9tIHN0cmF0 ZWd5IGZvciBsb2NhbCBzdG9yYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3VybHNjaGVtZWRlbGVnYXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGUuY3BwCmluZGV4IGU1ZDYzMDQz YmYwOTVhMGI4ODUyMGE0NzhmZThiYzQ3ZTM4NjQwMWMuLjYwNjIxNzViZjI3M2FmNzZhNTkyYmRh ODYxNzJlZjM3NzU0Mjk2MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGUuY3BwCkBAIC0yMyw2ICsyMywx MCBAQAogCiAjaW5jbHVkZSAicXF1aWNrbmV0d29ya3JlcGx5X3AuaCIKICNpbmNsdWRlICJxcXVp Y2tuZXR3b3JrcmVxdWVzdF9wLmgiCisjaW5jbHVkZSA8UU1pbWVEYXRhYmFzZT4KKyNpbmNsdWRl IDxRdENvcmUvUUZpbGU+CisjaW5jbHVkZSA8UXRDb3JlL1FGaWxlSW5mbz4KKyNpbmNsdWRlIDxR dENvcmUvUVVybD4KIAogUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGU6OlFRdWlja1VybFNjaGVtZURl bGVnYXRlKFFPYmplY3QqIHBhcmVudCkKICAgICA6IFFPYmplY3QocGFyZW50KQpAQCAtNTEsNCAr NTUsMjcgQEAgUVF1aWNrTmV0d29ya1JlcGx5KiBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZTo6cmVw bHkoKSBjb25zdAogICAgIHJldHVybiBtX3JlcGx5OwogfQogCitRUXVpY2tRcmNTY2hlbWVEZWxl Z2F0ZTo6UVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUoY29uc3QgUVVybCYgdXJsKQorICAgIDogUVF1 aWNrVXJsU2NoZW1lRGVsZWdhdGUoKQorICAgICwgbV9maWxlTmFtZShRTGF0aW4xQ2hhcignOicp ICsgdXJsLnBhdGgoKSkKK3sKK30KKwordm9pZCBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZTo6cmVh ZFJlc291cmNlQW5kU2VuZCgpCit7CisgICAgUUZpbGUgZmlsZShtX2ZpbGVOYW1lKTsKKyAgICBR RmlsZUluZm8gZmlsZUluZm8oZmlsZSk7CisgICAgaWYgKGZpbGVJbmZvLmlzRGlyKCkgfHwgIWZp bGUub3BlbihRSU9EZXZpY2U6OlJlYWRPbmx5IHwgUUlPRGV2aWNlOjpVbmJ1ZmZlcmVkKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgUUJ5dGVBcnJheSBmaWxlRGF0YShmaWxlLnJlYWRBbGwoKSk7 CisgICAgUU1pbWVEYXRhYmFzZSBtaW1lRGI7CisgICAgUU1pbWVUeXBlIG1pbWVUeXBlID0gbWlt ZURiLm1pbWVUeXBlRm9yRmlsZU5hbWVBbmREYXRhKG1fZmlsZU5hbWUsIGZpbGVEYXRhKTsKKyAg ICBmaWxlLmNsb3NlKCk7CisKKyAgICByZXBseSgpLT5zZXREYXRhKGZpbGVEYXRhKTsKKyAgICBy ZXBseSgpLT5zZXRDb250ZW50VHlwZShtaW1lVHlwZS5uYW1lKCkpOworICAgIHJlcGx5KCktPnNl bmQoKTsKK30KKwogI2luY2x1ZGUgIm1vY19xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmNwcCIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2No ZW1lZGVsZWdhdGVfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1 cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKaW5kZXggNmVlNjAyNzU0ZTZhMzhiODhmZTEwZWJkMTU0MTcw MGRiOGQzMmZlOS4uMDg3Y2IyOWI3NDdkNTI2MTBhMzEzYTk4YzAzZjRlZjA0NWJhMDY3MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVk ZWxlZ2F0ZV9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1 cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKQEAgLTI3LDYgKzI3LDcgQEAKIAogY2xhc3MgUVF1aWNrTmV0 d29ya1JlcXVlc3Q7CiBjbGFzcyBRUXVpY2tOZXR3b3JrUmVwbHk7CitjbGFzcyBRVXJsOwogCiBj bGFzcyBRV0VCS0lUX0VYUE9SVCBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSA6IHB1YmxpYyBRT2Jq ZWN0IHsKICAgICBRX09CSkVDVApAQCAtNTMsNiArNTQsMTYgQEAgcHJpdmF0ZToKIAogUU1MX0RF Q0xBUkVfVFlQRShRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSkKIAorY2xhc3MgUVF1aWNrUXJjU2No ZW1lRGVsZWdhdGUgOiBwdWJsaWMgUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUgeworICAgIFFfT0JK RUNUCitwdWJsaWM6CisgICAgUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUoY29uc3QgUVVybCYgdXJs KTsKKyAgICB2b2lkIHJlYWRSZXNvdXJjZUFuZFNlbmQoKTsKKworcHJpdmF0ZToKKyAgICBRU3Ry aW5nIG1fZmlsZU5hbWU7Cit9OworCiAjZW5kaWYgLy8gcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGVf cF9oCiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHAKaW5kZXggMjA1MzA3OWIwYjQyZWNlYjgxODJiZDBhOGU2NjcyOGM1OTkxOWUzMi4u OWU5ZmU5NWE3NDA0M2YyZDcxODc1MWFhYTQzZGNkM2Y4ZjQ4ZmUwMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0zMjgsNiAr MzI4LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRleHRS ZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGEKIAogICAgIHBhZ2VDbGllbnQuaW5pdGlh bGl6ZShxX3B0ciwgcGFnZVZpZXdQcml2YXRlLT5ldmVudEhhbmRsZXIuZGF0YSgpLCAmdW5kb0Nv bnRyb2xsZXIpOwogICAgIHdlYlBhZ2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB3 ZWJQYWdlUHJveHktPnJlZ2lzdGVyQXBwbGljYXRpb25TY2hlbWUoQVNDSUlMaXRlcmFsKCJxcmMi KSk7CiAKICAgICBxX3B0ci0+c2V0QWNjZXB0ZWRNb3VzZUJ1dHRvbnMoUXQ6Ok1vdXNlQnV0dG9u TWFzayk7CiAgICAgcV9wdHItPnNldEFjY2VwdEhvdmVyRXZlbnRzKHRydWUpOwpAQCAtMTMxMiw2 ICsxMzEzLDEyIEBAIFFRdWlja1VybFNjaGVtZURlbGVnYXRlKiBRUXVpY2tXZWJWaWV3RXhwZXJp bWVudGFsOjpzY2hlbWVEZWxlZ2F0ZXNfQXQoUVFtbExpc3RQCiAKIHZvaWQgUVF1aWNrV2ViVmll d0V4cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVuZChRUW1sTGlzdFByb3BlcnR5PFFR dWlja1VybFNjaGVtZURlbGVnYXRlPiogcHJvcGVydHksIFFRdWlja1VybFNjaGVtZURlbGVnYXRl ICpzY2hlbWUpCiB7CisgICAgaWYgKCFzY2hlbWUtPnNjaGVtZSgpLmNvbXBhcmUoUUxhdGluMVN0 cmluZygicXJjIiksIFF0OjpDYXNlSW5zZW5zaXRpdmUpKSB7CisgICAgICAgIHFXYXJuaW5nKCJX QVJOSU5HOiBUaGUgcXJjIHNjaGVtZSBpcyByZXNlcnZlZCB0byBiZSBoYW5kbGVkIGludGVybmFs bHkuIFRoZSBoYW5kbGVyIHdpbGwgYmUgaWdub3JlZC4iKTsKKyAgICAgICAgZGVsZXRlIHNjaGVt ZTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFFPYmplY3QqIHNjaGVtZVBhcmVudCA9 IHByb3BlcnR5LT5vYmplY3Q7CiAgICAgc2NoZW1lLT5zZXRQYXJlbnQoc2NoZW1lUGFyZW50KTsK ICAgICBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKiB3ZWJWaWV3RXhwZXJpbWVudGFsID0gcW9i amVjdF9jYXN0PFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwqPihwcm9wZXJ0eS0+b2JqZWN0LT5w YXJlbnQoKSk7CkBAIC0xMzQ5LDYgKzEzNTYsMTUgQEAgUVFtbExpc3RQcm9wZXJ0eTxRUXVpY2tV cmxTY2hlbWVEZWxlZ2F0ZT4gUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWcK IHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6aW52b2tlQXBwbGljYXRpb25TY2hlbWVI YW5kbGVyKFBhc3NSZWZQdHI8UXRSZWZDb3VudGVkTmV0d29ya1JlcXVlc3REYXRhPiByZXF1ZXN0 KQogewogICAgIFJlZlB0cjxRdFJlZkNvdW50ZWROZXR3b3JrUmVxdWVzdERhdGE+IHJlcSA9IHJl cXVlc3Q7CisgICAgaWYgKHJlcS0+ZGF0YSgpLm1fc2NoZW1lLnN0YXJ0c1dpdGgoInFyYyIsIGZh bHNlKSkgeworICAgICAgICBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZSBxcmNEZWxlZ2F0ZShRVXJs KFFTdHJpbmcocmVxLT5kYXRhKCkubV91cmxTdHJpbmcpKSk7CisgICAgICAgIHFyY0RlbGVnYXRl LnJlcXVlc3QoKS0+c2V0TmV0d29ya1JlcXVlc3REYXRhKHJlcSk7CisgICAgICAgIHFyY0RlbGVn YXRlLnJlcGx5KCktPnNldE5ldHdvcmtSZXF1ZXN0RGF0YShyZXEpOworICAgICAgICBxcmNEZWxl Z2F0ZS5yZXBseSgpLT5zZXRXZWJWaWV3RXhwZXJpbWVudGFsKHRoaXMpOworICAgICAgICBxcmNE ZWxlZ2F0ZS5yZWFkUmVzb3VyY2VBbmRTZW5kKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK ICAgICBjb25zdCBRT2JqZWN0TGlzdCBjaGlsZHJlbiA9IHNjaGVtZVBhcmVudC0+Y2hpbGRyZW4o KTsKICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwgY2hpbGRyZW4uY291bnQoKTsgaW5k ZXgrKykgewogICAgICAgICBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSogZGVsZWdhdGUgPSBxb2Jq ZWN0X2Nhc3Q8UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUqPihjaGlsZHJlbi5hdChpbmRleCkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0 cy9XZWJWaWV3L3RzdF9hcHBsaWNhdGlvblNjaGVtZS5xbWwgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2FwcGxpY2F0aW9uU2NoZW1l LnFtbAppbmRleCA0ZmUwODEyOThkOGE5ZTViNjliYjJmNGY2OTI1OTU4YjExN2ZjYTJkLi5lNTYx ZTFhMzJkMTg1ZWYwYjM0ODI0MDY1OTE3YzdlMmMzNjFkN2NlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2FwcGxp Y2F0aW9uU2NoZW1lLnFtbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2FwcGxpY2F0aW9uU2NoZW1lLnFtbApAQCAtMTEzLDUg KzExMywxMyBAQCBUZXN0V2ViVmlldyB7CiAgICAgICAgICAgICB2ZXJpZnkod2ViVmlldy53YWl0 Rm9yTG9hZFN1Y2NlZWRlZCgpKQogICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3LnRpdGxlLCAi dGl0bGUgd2l0aCBjb3B5cmlnaHQgwqkiKQogICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24g dGVzdF9xcmNTY2hlbWUoKSB7CisgICAgICAgICAgICB2YXIgdGVzdFVybCA9ICJxcmM6Ly8vY29t bW9uL3FyY3Rlc3QuaHRtbCIKKyAgICAgICAgICAgIHdlYlZpZXcudXJsID0gdGVzdFVybAorICAg ICAgICAgICAgdmVyaWZ5KHdlYlZpZXcud2FpdEZvckxvYWRTdWNjZWVkZWQoKSkKKyAgICAgICAg ICAgIGNvbXBhcmUod2ViVmlldy50aXRsZSwgIkxvYWRlZCBmcm9tIHFyYy4iKQorCisgICAgICAg IH0KICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3Rlc3RzL3FtbHRlc3RzL2NvbW1vbi9xcmN0ZXN0Lmh0bWwgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL2NvbW1vbi9xcmN0ZXN0Lmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uOThmMjVmYjdlZDc3YzcyNTg0YzhiZGU3YmU1ZTk0NDQ0NjQ3YTNiMgotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvY29t bW9uL3FyY3Rlc3QuaHRtbApAQCAtMCwwICsxLDYgQEAKKzxodG1sPgorPGhlYWQ+PHRpdGxlPkxv YWRlZCBmcm9tIHFyYy48L3RpdGxlPjwvaGVhZD4KKzxib2R5PgorSGVsbG8uIEkgd2FzIGxvYWRl ZCBmcm9tIGEgcXJjIGZpbGUuIEFtYXppbmcuCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3Jlc291cmNl cy5xcmMgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3Jl c291cmNlcy5xcmMKaW5kZXggMTY5NmFhYWMxMDE4ZmNhZjM3M2NjZTg4MzdiNzA4MDA3ZTdiYWYw MC4uZjI1MTg2NWVmN2NiZDY2NTM1M2M0ZjJmMTEzMWUxZmQ1ZDJlOTdkZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9yZXNvdXJjZXMu cXJjCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMv cmVzb3VyY2VzLnFyYwpAQCAtMSw1ICsxLDYgQEAKIDxSQ0M+CiAgICAgPHFyZXNvdXJjZSBwcmVm aXg9Ii8iPgogICAgICAgICA8ZmlsZT5jb21tb24vY2hhbmdlLWRvY3VtZW50LXRpdGxlLmpzPC9m aWxlPgorICAgICAgICA8ZmlsZT5jb21tb24vcXJjdGVzdC5odG1sPC9maWxlPgogICAgIDwvcXJl c291cmNlPgogPC9SQ0M+Cg== 184460 2013-01-24 04:10:01 -0800 2013-01-24 04:19:51 -0800 Patch bug-107031-20130124130653.patch text/plain 8239 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTdkMjNkYzk2MjBjNGQy NWM1YjAxNzdkMWE4YWVmYmQzMjE0MzdjMy4uZTJhNGYzYTFmODc5ZjE4Y2Y3Yjc1NmM1YjM4MWQ4 MmRjZjUxY2Q4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAxLTI0ICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gUGFnZXMgLyByZXNvdXJjZXMgY2Fubm90IGJlIGxvYWRlZCBmcm9tIHFyYyBmaWxlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzAzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZXMg V2ViS2l0MiBRdCBhcHBsaWNhdGlvbnMgdG8gbG9hZCBmaWxlcyBmcm9tIHRoZSBidW5kbGVkCisg ICAgICAgIHFyYyBmaWxlcy4gVGhpcyBpcyBhY2hpZXZlZCBieSBhZGRpbmcgYSB1cmwgc2NoZW1l IGhhbmRsZXIgZm9yCisgICAgICAgIHRoZSAicXJjIiBzY2hlbWUgdXNpbmcgdGhlIGFwcGxpY2F0 aW9uIHNjaGVtZSBoYW5kbGVyIGFuZCBpZ25vcmluZworICAgICAgICBhbGwgaGFuZGxlcnMgZm9y IHRoZSBxcmMgYXBwbGljYXRpb24gc2NoZW1lIHRoYXQgdGhlIGFwcGxpY2F0aW9uIG1pZ2h0Cisg ICAgICAgIHNldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrdXJsc2NoZW1l ZGVsZWdhdGUuY3BwOgorICAgICAgICAoUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGU6OlFRdWlja1Fy Y1NjaGVtZURlbGVnYXRlKToKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlOjpyZWFk UmVzb3VyY2VBbmRTZW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNj aGVtZWRlbGVnYXRlX3AuaDoKKyAgICAgICAgKFFRdWlja1FyY1NjaGVtZURlbGVnYXRlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld0V4 cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVuZCk6CisgICAgICAgIChRUXVpY2tXZWJW aWV3RXhwZXJpbWVudGFsOjppbnZva2VBcHBsaWNhdGlvblNjaGVtZUhhbmRsZXIpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfYXBwbGljYXRp b25TY2hlbWUucW1sOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMv Y29tbW9uL3FyY3Rlc3QuaHRtbDogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90 ZXN0cy9xbWx0ZXN0cy9yZXNvdXJjZXMucXJjOgorCiAyMDEzLTAxLTI0ICBLcnp5c3p0b2YgQ3pl Y2ggIDxrLmN6ZWNoQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gRXhwb3NlIGFj Y2Vzc2liaWxpdHkgaGllcmFyY2h5IGluIFdlYktpdDItRUZMLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNjaGVtZWRlbGVnYXRlLmNw cAppbmRleCBlNWQ2MzA0M2JmMDk1YTBiODg1MjBhNDc4ZmU4YmM0N2UzODY0MDFjLi5hMTBjODlk YTRhNzYzMGUxYmIyMzViNDc2MzI4MTMyYjcwODNkNjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNjaGVtZWRlbGVnYXRlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3VybHNjaGVtZWRlbGVnYXRlLmNw cApAQCAtMjQsNiArMjQsMTEgQEAKICNpbmNsdWRlICJxcXVpY2tuZXR3b3JrcmVwbHlfcC5oIgog I2luY2x1ZGUgInFxdWlja25ldHdvcmtyZXF1ZXN0X3AuaCIKIAorI2luY2x1ZGUgPFF0Q29yZS9R RmlsZT4KKyNpbmNsdWRlIDxRdENvcmUvUUZpbGVJbmZvPgorI2luY2x1ZGUgPFF0Q29yZS9RTWlt ZURhdGFiYXNlPgorI2luY2x1ZGUgPFF0Q29yZS9RVXJsPgorCiBRUXVpY2tVcmxTY2hlbWVEZWxl Z2F0ZTo6UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUoUU9iamVjdCogcGFyZW50KQogICAgIDogUU9i amVjdChwYXJlbnQpCiAgICAgLCBtX3JlcXVlc3QobmV3IFFRdWlja05ldHdvcmtSZXF1ZXN0KHRo aXMpKQpAQCAtNTEsNCArNTYsMjcgQEAgUVF1aWNrTmV0d29ya1JlcGx5KiBRUXVpY2tVcmxTY2hl bWVEZWxlZ2F0ZTo6cmVwbHkoKSBjb25zdAogICAgIHJldHVybiBtX3JlcGx5OwogfQogCitRUXVp Y2tRcmNTY2hlbWVEZWxlZ2F0ZTo6UVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUoY29uc3QgUVVybCYg dXJsKQorICAgIDogUVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUoKQorICAgICwgbV9maWxlTmFtZShR TGF0aW4xQ2hhcignOicpICsgdXJsLnBhdGgoKSkKK3sKK30KKwordm9pZCBRUXVpY2tRcmNTY2hl bWVEZWxlZ2F0ZTo6cmVhZFJlc291cmNlQW5kU2VuZCgpCit7CisgICAgUUZpbGUgZmlsZShtX2Zp bGVOYW1lKTsKKyAgICBRRmlsZUluZm8gZmlsZUluZm8oZmlsZSk7CisgICAgaWYgKGZpbGVJbmZv LmlzRGlyKCkgfHwgIWZpbGUub3BlbihRSU9EZXZpY2U6OlJlYWRPbmx5IHwgUUlPRGV2aWNlOjpV bmJ1ZmZlcmVkKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUUJ5dGVBcnJheSBmaWxlRGF0YShm aWxlLnJlYWRBbGwoKSk7CisgICAgUU1pbWVEYXRhYmFzZSBtaW1lRGI7CisgICAgUU1pbWVUeXBl IG1pbWVUeXBlID0gbWltZURiLm1pbWVUeXBlRm9yRmlsZU5hbWVBbmREYXRhKG1fZmlsZU5hbWUs IGZpbGVEYXRhKTsKKyAgICBmaWxlLmNsb3NlKCk7CisKKyAgICByZXBseSgpLT5zZXREYXRhKGZp bGVEYXRhKTsKKyAgICByZXBseSgpLT5zZXRDb250ZW50VHlwZShtaW1lVHlwZS5uYW1lKCkpOwor ICAgIHJlcGx5KCktPnNlbmQoKTsKK30KKwogI2luY2x1ZGUgIm1vY19xcXVpY2t1cmxzY2hlbWVk ZWxlZ2F0ZV9wLmNwcCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrdXJsc2NoZW1lZGVsZWdhdGVfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKaW5kZXggNmVlNjAyNzU0ZTZhMzhi ODhmZTEwZWJkMTU0MTcwMGRiOGQzMmZlOS4uMDg3Y2IyOWI3NDdkNTI2MTBhMzEzYTk4YzAzZjRl ZjA0NWJhMDY3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t1cmxzY2hlbWVkZWxlZ2F0ZV9wLmgKQEAgLTI3LDYgKzI3LDcgQEAKIAog Y2xhc3MgUVF1aWNrTmV0d29ya1JlcXVlc3Q7CiBjbGFzcyBRUXVpY2tOZXR3b3JrUmVwbHk7Citj bGFzcyBRVXJsOwogCiBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0 ZSA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVApAQCAtNTMsNiArNTQsMTYgQEAgcHJp dmF0ZToKIAogUU1MX0RFQ0xBUkVfVFlQRShRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSkKIAorY2xh c3MgUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUgOiBwdWJsaWMgUVF1aWNrVXJsU2NoZW1lRGVsZWdh dGUgeworICAgIFFfT0JKRUNUCitwdWJsaWM6CisgICAgUVF1aWNrUXJjU2NoZW1lRGVsZWdhdGUo Y29uc3QgUVVybCYgdXJsKTsKKyAgICB2b2lkIHJlYWRSZXNvdXJjZUFuZFNlbmQoKTsKKworcHJp dmF0ZToKKyAgICBRU3RyaW5nIG1fZmlsZU5hbWU7Cit9OworCiAjZW5kaWYgLy8gcXF1aWNrdXJs c2NoZW1lZGVsZWdhdGVfcF9oCiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggMjA1MzA3OWIwYjQyZWNlYjgxODJiZDBhOGU2 NjcyOGM1OTkxOWUzMi4uOWU5ZmU5NWE3NDA0M2YyZDcxODc1MWFhYTQzZGNkM2Y4ZjQ4ZmUwMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcu Y3BwCkBAIC0zMjgsNiArMzI4LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlh bGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGEKIAogICAgIHBh Z2VDbGllbnQuaW5pdGlhbGl6ZShxX3B0ciwgcGFnZVZpZXdQcml2YXRlLT5ldmVudEhhbmRsZXIu ZGF0YSgpLCAmdW5kb0NvbnRyb2xsZXIpOwogICAgIHdlYlBhZ2VQcm94eS0+aW5pdGlhbGl6ZVdl YlBhZ2UoKTsKKyAgICB3ZWJQYWdlUHJveHktPnJlZ2lzdGVyQXBwbGljYXRpb25TY2hlbWUoQVND SUlMaXRlcmFsKCJxcmMiKSk7CiAKICAgICBxX3B0ci0+c2V0QWNjZXB0ZWRNb3VzZUJ1dHRvbnMo UXQ6Ok1vdXNlQnV0dG9uTWFzayk7CiAgICAgcV9wdHItPnNldEFjY2VwdEhvdmVyRXZlbnRzKHRy dWUpOwpAQCAtMTMxMiw2ICsxMzEzLDEyIEBAIFFRdWlja1VybFNjaGVtZURlbGVnYXRlKiBRUXVp Y2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzY2hlbWVEZWxlZ2F0ZXNfQXQoUVFtbExpc3RQCiAKIHZv aWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2NoZW1lRGVsZWdhdGVzX0FwcGVuZChRUW1s TGlzdFByb3BlcnR5PFFRdWlja1VybFNjaGVtZURlbGVnYXRlPiogcHJvcGVydHksIFFRdWlja1Vy bFNjaGVtZURlbGVnYXRlICpzY2hlbWUpCiB7CisgICAgaWYgKCFzY2hlbWUtPnNjaGVtZSgpLmNv bXBhcmUoUUxhdGluMVN0cmluZygicXJjIiksIFF0OjpDYXNlSW5zZW5zaXRpdmUpKSB7CisgICAg ICAgIHFXYXJuaW5nKCJXQVJOSU5HOiBUaGUgcXJjIHNjaGVtZSBpcyByZXNlcnZlZCB0byBiZSBo YW5kbGVkIGludGVybmFsbHkuIFRoZSBoYW5kbGVyIHdpbGwgYmUgaWdub3JlZC4iKTsKKyAgICAg ICAgZGVsZXRlIHNjaGVtZTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFFPYmplY3Qq IHNjaGVtZVBhcmVudCA9IHByb3BlcnR5LT5vYmplY3Q7CiAgICAgc2NoZW1lLT5zZXRQYXJlbnQo c2NoZW1lUGFyZW50KTsKICAgICBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsKiB3ZWJWaWV3RXhw ZXJpbWVudGFsID0gcW9iamVjdF9jYXN0PFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwqPihwcm9w ZXJ0eS0+b2JqZWN0LT5wYXJlbnQoKSk7CkBAIC0xMzQ5LDYgKzEzNTYsMTUgQEAgUVFtbExpc3RQ cm9wZXJ0eTxRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZT4gUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRh bDo6c2NoZW1lRGVsZWcKIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6aW52b2tlQXBw bGljYXRpb25TY2hlbWVIYW5kbGVyKFBhc3NSZWZQdHI8UXRSZWZDb3VudGVkTmV0d29ya1JlcXVl c3REYXRhPiByZXF1ZXN0KQogewogICAgIFJlZlB0cjxRdFJlZkNvdW50ZWROZXR3b3JrUmVxdWVz dERhdGE+IHJlcSA9IHJlcXVlc3Q7CisgICAgaWYgKHJlcS0+ZGF0YSgpLm1fc2NoZW1lLnN0YXJ0 c1dpdGgoInFyYyIsIGZhbHNlKSkgeworICAgICAgICBRUXVpY2tRcmNTY2hlbWVEZWxlZ2F0ZSBx cmNEZWxlZ2F0ZShRVXJsKFFTdHJpbmcocmVxLT5kYXRhKCkubV91cmxTdHJpbmcpKSk7CisgICAg ICAgIHFyY0RlbGVnYXRlLnJlcXVlc3QoKS0+c2V0TmV0d29ya1JlcXVlc3REYXRhKHJlcSk7Cisg ICAgICAgIHFyY0RlbGVnYXRlLnJlcGx5KCktPnNldE5ldHdvcmtSZXF1ZXN0RGF0YShyZXEpOwor ICAgICAgICBxcmNEZWxlZ2F0ZS5yZXBseSgpLT5zZXRXZWJWaWV3RXhwZXJpbWVudGFsKHRoaXMp OworICAgICAgICBxcmNEZWxlZ2F0ZS5yZWFkUmVzb3VyY2VBbmRTZW5kKCk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKICAgICBjb25zdCBRT2JqZWN0TGlzdCBjaGlsZHJlbiA9IHNjaGVtZVBh cmVudC0+Y2hpbGRyZW4oKTsKICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwgY2hpbGRy ZW4uY291bnQoKTsgaW5kZXgrKykgewogICAgICAgICBRUXVpY2tVcmxTY2hlbWVEZWxlZ2F0ZSog ZGVsZWdhdGUgPSBxb2JqZWN0X2Nhc3Q8UVF1aWNrVXJsU2NoZW1lRGVsZWdhdGUqPihjaGlsZHJl bi5hdChpbmRleCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9hcHBsaWNhdGlvblNjaGVtZS5xbWwgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2Fw cGxpY2F0aW9uU2NoZW1lLnFtbAppbmRleCA0ZmUwODEyOThkOGE5ZTViNjliYjJmNGY2OTI1OTU4 YjExN2ZjYTJkLi5lNTYxZTFhMzJkMTg1ZWYwYjM0ODI0MDY1OTE3YzdlMmMzNjFkN2NlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dl YlZpZXcvdHN0X2FwcGxpY2F0aW9uU2NoZW1lLnFtbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2FwcGxpY2F0aW9uU2NoZW1l LnFtbApAQCAtMTEzLDUgKzExMywxMyBAQCBUZXN0V2ViVmlldyB7CiAgICAgICAgICAgICB2ZXJp Znkod2ViVmlldy53YWl0Rm9yTG9hZFN1Y2NlZWRlZCgpKQogICAgICAgICAgICAgY29tcGFyZSh3 ZWJWaWV3LnRpdGxlLCAidGl0bGUgd2l0aCBjb3B5cmlnaHQgwqkiKQogICAgICAgICB9CisKKyAg ICAgICAgZnVuY3Rpb24gdGVzdF9xcmNTY2hlbWUoKSB7CisgICAgICAgICAgICB2YXIgdGVzdFVy bCA9ICJxcmM6Ly8vY29tbW9uL3FyY3Rlc3QuaHRtbCIKKyAgICAgICAgICAgIHdlYlZpZXcudXJs ID0gdGVzdFVybAorICAgICAgICAgICAgdmVyaWZ5KHdlYlZpZXcud2FpdEZvckxvYWRTdWNjZWVk ZWQoKSkKKyAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy50aXRsZSwgIkxvYWRlZCBmcm9tIHFy Yy4iKQorCisgICAgICAgIH0KICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL2NvbW1vbi9xcmN0ZXN0Lmh0bWwgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL2NvbW1vbi9xcmN0ZXN0 Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uOThmMjVmYjdlZDc3YzcyNTg0YzhiZGU3YmU1ZTk0NDQ0NjQ3YTNi MgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVz dHMvcW1sdGVzdHMvY29tbW9uL3FyY3Rlc3QuaHRtbApAQCAtMCwwICsxLDYgQEAKKzxodG1sPgor PGhlYWQ+PHRpdGxlPkxvYWRlZCBmcm9tIHFyYy48L3RpdGxlPjwvaGVhZD4KKzxib2R5PgorSGVs bG8uIEkgd2FzIGxvYWRlZCBmcm9tIGEgcXJjIGZpbGUuIEFtYXppbmcuCis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3Ft bHRlc3RzL3Jlc291cmNlcy5xcmMgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3FtbHRlc3RzL3Jlc291cmNlcy5xcmMKaW5kZXggMTY5NmFhYWMxMDE4ZmNhZjM3M2NjZTg4 MzdiNzA4MDA3ZTdiYWYwMC4uZjI1MTg2NWVmN2NiZDY2NTM1M2M0ZjJmMTEzMWUxZmQ1ZDJlOTdk ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0 ZXN0cy9yZXNvdXJjZXMucXJjCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvcW1sdGVzdHMvcmVzb3VyY2VzLnFyYwpAQCAtMSw1ICsxLDYgQEAKIDxSQ0M+CiAgICAg PHFyZXNvdXJjZSBwcmVmaXg9Ii8iPgogICAgICAgICA8ZmlsZT5jb21tb24vY2hhbmdlLWRvY3Vt ZW50LXRpdGxlLmpzPC9maWxlPgorICAgICAgICA8ZmlsZT5jb21tb24vcXJjdGVzdC5odG1sPC9m aWxlPgogICAgIDwvcXJlc291cmNlPgogPC9SQ0M+Cg==