34730 2010-02-08 15:57:21 -0800 [Qt] Null QObjects properties cause Segmentation Fault 2014-04-24 16:45:10 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All CLOSED FIXED Qt P1 Normal --- 35784 1 bruno.schmidt webkit-qt-unassigned benjamin commit-queue hausmann kenneth kent.hansen laszlo.gombos tonikitoo webkit.review.bot oldest_to_newest 188814 0 48372 bruno.schmidt 2010-02-08 15:57:21 -0800 Created attachment 48372 Patch fixing the bug If an QObject is added to the javascript context and it contains properties of the type QObject* with NULL value, calling the property causes Segmentation Fault. So now the code checks for objects which are null and threat them accordingly: * QtInstance::getClass() may return NULL * QtInstance::stringValue(ExecState* exec) may return jsNull() * QtInstance::booleanValue() may return false. 196529 1 benjamin 2010-03-05 10:04:03 -0800 You need to create an autotest for the bug. The patches for Webkit requred an entry in the changelog: You execute WebKitTools/Scripts/prepare-changelog --bug 34730, then you edit the changelog to describe the changes, and you include it in the diff. When submitting the patch, you should set the review and commit queue flag to "?". Otherwise the patch is often ignored. 197714 2 50338 bruno.schmidt 2010-03-09 12:08:16 -0800 Created attachment 50338 Bug Test Program The test program tries to show 3 alerts but the last segfaults because it is a property returning a null QObjetc. 197715 3 webkit.review.bot 2010-03-09 12:10:16 -0800 Attachment 50338 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. 197757 4 50338 benjamin 2010-03-09 13:57:49 -0800 Comment on attachment 50338 Bug Test Program Remove the review flag. This is not a patch, it is a test case. 197759 5 benjamin 2010-03-09 14:00:49 -0800 (In reply to comment #2) > Created an attachment (id=50338) [details] > Bug Test Program > > The test program tries to show 3 alerts but the last segfaults because it is a > property returning a null QObjetc. Actually, I was not asking for a test case but for a unit test in your patch. We have unittests for QtWebkit in WebKit/qt/tests (those unit test are generally called autotest in Qt because they are run automatically). By making an autotest with your patch, you ensure there will never be a regression for this bug. 208997 6 benjamin 2010-04-06 05:25:48 -0700 Any chance you finish the patch? 210251 7 52876 bruno.schmidt 2010-04-08 09:45:50 -0700 Created attachment 52876 Updated patch with changelog and testcases. Since I am using git the patch was made usign "git diff" the other steps where as said on "contributing". Sorry for the delay. 210252 8 webkit.review.bot 2010-04-08 09:50:23 -0700 Attachment 52876 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bridge/qt/qt_runtime.cpp:874: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WARNING: File exempt from style guide. Skipping: "WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" WebCore/bridge/qt/qt_instance.cpp:264: Missing space before ( in if( [whitespace/parens] [5] WebCore/bridge/qt/qt_instance.cpp:316: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 210256 9 benjamin 2010-04-08 10:27:44 -0700 (In reply to comment #7) > Created an attachment (id=52876) [details] > Updated patch with changelog and testcases. > > Since I am using git the patch was made usign "git diff" the other steps where > as said on "contributing". The tools works if the patch is done with git, no problem with that. > Sorry for the delay. I reset the priority to P1 since you are working on it. About the coding style, you can check it locally with WebKitTools/Script/check-webkit-style 210265 10 52877 bruno.schmidt 2010-04-08 10:51:46 -0700 Created attachment 52877 Rebased and changed coding style. 210305 11 52877 benjamin 2010-04-08 12:03:14 -0700 Comment on attachment 52877 Rebased and changed coding style. Setting the queue flag. 210927 12 52877 hausmann 2010-04-09 14:19:23 -0700 Comment on attachment 52877 Rebased and changed coding style. > + No new tests. (OOPS!) Please remove this line from the ChangeLog. After all you do have unit tests :) > // ECMA 9.2 > - return jsBoolean(true); > + return jsBoolean(getObject() ? true : false); Is the ? true : false part really needed? :) > m_readOnlyValue(987), > + m_objectStar(0), > m_qtFunctionInvoked(-1) { } The indentation seems off here. The rest of the patch looks good to me. Good catch, thank you! r- because of the ChangeLog and indentation. 210932 13 52989 bruno.schmidt 2010-04-09 14:37:29 -0700 Created attachment 52989 Fixed the reported patch problems Do you know if this patch still can be merged in QtWebKit 2.0? 210959 14 benjamin 2010-04-09 15:20:17 -0700 (In reply to comment #13) > Do you know if this patch still can be merged in QtWebKit 2.0? Yep it can. If the patch is not risky, one can mark it as blocking WebKit 2.0, and Simon will cherry pick it. 212052 15 bruno.schmidt 2010-04-13 13:16:51 -0700 (In reply to comment #12) > (From update of attachment 52877 [details]) > > > + No new tests. (OOPS!) > > Please remove this line from the ChangeLog. After all you do have unit tests :) > > > // ECMA 9.2 > > - return jsBoolean(true); > > + return jsBoolean(getObject() ? true : false); > > Is the ? true : false part really needed? :) > > > m_readOnlyValue(987), > > + m_objectStar(0), > > m_qtFunctionInvoked(-1) { } > > The indentation seems off here. > > The rest of the patch looks good to me. Good catch, thank you! > > r- because of the ChangeLog and indentation. Those problems are already fixed. Any news about the merge? 212520 16 52989 kenneth 2010-04-14 13:10:51 -0700 Comment on attachment 52989 Fixed the reported patch problems > + QObjects exported to the QWebkit javascript with properties that are a null "QObject*" cause Segmentation Fault. > + > + If an QObject is added to the javascript context and it contains properties of the type QObject* with NULL value, calling the property causes Segmentation Fault. > + So now the code checks for objects which are null and threat them accordingly: > + * QtInstance::getClass() may return NULL > + * QtInstance::stringValue(ExecState* exec) may return jsNull() > + * QtInstance::booleanValue() may return false. > + * convertQVariantToValue(...) QObjectStar conversion returns jsNull() if obj is null Can you please wrap the lines at 80-100 chars? > + > + [Qt] Null QObjects properties cause Segmentation Fault > + https://bugs.webkit.org/show_bug.cgi?id=34730 This should be at the top. 212590 17 53370 bruno.schmidt 2010-04-14 14:51:00 -0700 Created attachment 53370 Patch with the corrections requested by Kenneth Rohde Christiansen 212605 18 53370 kenneth 2010-04-14 15:10:57 -0700 Comment on attachment 53370 Patch with the corrections requested by Kenneth Rohde Christiansen > Class* QtInstance::getClass() const > { > - if (!m_class) > + if (!m_class) { > + if (!m_object) > + return 0; > m_class = QtClass::classForObject(m_object); > + } > return m_class; > } The code would break other code in the file such as: MethodList methodList = getClass()->methodsNamed(propertyName, this); so that might need fixing as well. > @@ -257,11 +260,14 @@ JSValue QtInstance::defaultValue(ExecState* exec, PreferredPrimitiveType hint) c > > JSValue QtInstance::stringValue(ExecState* exec) const > { > + QObject* obj = getObject(); > + if (!obj) > + return jsNull(); Good change! > + > // Hmm.. see if there is a toString defined > QByteArray buf; > bool useDefault = true; > getClass(); > - QObject* obj = getObject(); > if (m_class && obj) { You do not need the obj check here any longer > JSValue QtInstance::booleanValue() const > { > // ECMA 9.2 > - return jsBoolean(true); > + return jsBoolean(getObject()); > } Confirmed to be in line with the ECMA 9.2. > @@ -871,6 +871,8 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con > > if (type == QMetaType::QObjectStar || type == QMetaType::QWidgetStar) { > QObject* obj = variant.value<QObject*>(); > + if (!obj) > + return jsNull(); > return QtInstance::getQtInstance(obj, root, QScriptEngine::QtOwnership)->createRuntimeObject(exec); > } Awesome! Good testing! 212666 19 bruno.schmidt 2010-04-14 17:27:22 -0700 (In reply to comment #18) First, thanks for the comments. I have checked the other implementations and the correct behavior is that the 'Instance' represents an object instance and can't be null. So nobody checks getClass() result. The changes I made are only strengthening QtInstance while the real correction is at convertQVariantToValue() by not creating a QtInstance out of a null QObject*. So I'm changing the code fix the problem reported on QtInstance::getMethod to return jsNull. > (From update of attachment 53370 [details]) > > > Class* QtInstance::getClass() const > > { > > - if (!m_class) > > + if (!m_class) { > > + if (!m_object) > > + return 0; > > m_class = QtClass::classForObject(m_object); > > + } > > return m_class; > > } > > The code would break other code in the file such as: > > MethodList methodList = getClass()->methodsNamed(propertyName, this); > > so that might need fixing as well. > > > > @@ -257,11 +260,14 @@ JSValue QtInstance::defaultValue(ExecState* exec, PreferredPrimitiveType hint) c > > > > JSValue QtInstance::stringValue(ExecState* exec) const > > { > > + QObject* obj = getObject(); > > + if (!obj) > > + return jsNull(); > > Good change! > > > + > > // Hmm.. see if there is a toString defined > > QByteArray buf; > > bool useDefault = true; > > getClass(); > > - QObject* obj = getObject(); > > if (m_class && obj) { > > You do not need the obj check here any longer > > > JSValue QtInstance::booleanValue() const > > { > > // ECMA 9.2 > > - return jsBoolean(true); > > + return jsBoolean(getObject()); > > } > > Confirmed to be in line with the ECMA 9.2. > > > > @@ -871,6 +871,8 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con > > > > if (type == QMetaType::QObjectStar || type == QMetaType::QWidgetStar) { > > QObject* obj = variant.value<QObject*>(); > > + if (!obj) > > + return jsNull(); > > return QtInstance::getQtInstance(obj, root, QScriptEngine::QtOwnership)->createRuntimeObject(exec); > > } > > Awesome! > > Good testing! 212667 20 53387 bruno.schmidt 2010-04-14 17:31:44 -0700 Created attachment 53387 Patch with the corrections requested by Kenneth (Comment #18) 212794 21 53387 commit-queue 2010-04-15 03:03:39 -0700 Comment on attachment 53387 Patch with the corrections requested by Kenneth (Comment #18) Clearing flags on attachment: 53387 Committed r57638: <http://trac.webkit.org/changeset/57638> 212795 22 commit-queue 2010-04-15 03:03:46 -0700 All reviewed patches have been landed. Closing bug. 213062 23 hausmann 2010-04-15 14:46:07 -0700 Revision r57638 cherry-picked into qtwebkit-2.0 with commit 1ee9828c1a615345b01e471d34b5efdeb984f13f 1003847 24 darin 2014-04-24 16:45:10 -0700 Moving all JavaScriptGlue bugs to JavaScriptCore. The JavaScriptGlue framework itself is long gone. And most of the more recent bugs put in this component were put there by people who thought this was for some other aspect of “JavaScript glue” and have nothing to do with the actual original reason for the existence of this component, which was an OS-X-only framework named JavaScriptGlue. 48372 2010-02-08 15:57:21 -0800 2010-04-08 09:45:50 -0700 Patch fixing the bug webkit-NullProperty.patch text/plain 2073 bruno.schmidt RnJvbSA0OTUwMGRkZDkyNDg5Yjg4MGQ2ZjZhMjQ1MmZiMjM4ZGE4ZGFmZmYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVubyBTY2htaWR0IDxicnVuby5zY2htaWR0QGdtYWlsLmNv bT4KRGF0ZTogTW9uLCA4IEZlYiAyMDEwIDE3OjIwOjQ5IC0wMjAwClN1YmplY3Q6IFFPYmplY3Rz IGV4cG9ydGVkIHRvIHRoZSBRV2Via2l0IGphdmFzY3JpcHQgd2l0aCBwcm9wZXJ0aWVzIHRoYXQg YXJlIGEKIG51bGwgIlFPYmplY3QqIiBjYXVzZSBTZWdtZW50YXRpb24gRmF1bHQuCgpJZiBhbiBR T2JqZWN0IGlzIGFkZGVkIHRvIHRoZSBqYXZhc2NyaXB0IGNvbnRleHQgYW5kIGl0IGNvbnRhaW5z CnByb3BlcnRpZXMgb2YgdGhlIHR5cGUgUU9iamVjdCogd2l0aCBOVUxMIHZhbHVlLCBjYWxsaW5n IHRoZSBwcm9wZXJ0eQpjYXVzZXMgU2VnbWVudGF0aW9uIEZhdWx0LgpTbyBub3cgdGhlIGNvZGUg Y2hlY2tzIGZvciBvYmplY3RzIHdoaWNoIGFyZSBudWxsIGFuZCB0aHJlYXQgdGhlbQphY2NvcmRp bmdseToKICogUXRJbnN0YW5jZTo6Z2V0Q2xhc3MoKSBtYXkgcmV0dXJuIE5VTEwKICogUXRJbnN0 YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBtYXkgcmV0dXJuIGpzTnVsbCgpCiAq IFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgpIG1heSByZXR1cm4gZmFsc2UuCi0tLQogV2ViQ29y ZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwIHwgICAxMSArKysrKysrKy0tLQogMSBmaWxlcyBj aGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5z dGFuY2UuY3BwCmluZGV4IGVjMzYyZWMuLjY2ZTYxOGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJp ZGdlL3F0L3F0X2luc3RhbmNlLmNwcAorKysgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5j ZS5jcHAKQEAgLTE2Myw3ICsxNjMsOSBAQCBRdEluc3RhbmNlKiBRdEluc3RhbmNlOjpnZXRJbnN0 YW5jZShKU09iamVjdCogb2JqZWN0KQogCiBDbGFzcyogUXRJbnN0YW5jZTo6Z2V0Q2xhc3MoKSBj b25zdAogewotICAgIGlmICghbV9jbGFzcykKKyAgICBpZiAoIW1fY2xhc3MpIHsKKyAgICAgICAg aWYgKCFtX29iamVjdCkKKwkgICAgcmV0dXJuIDA7CiAgICAgICAgIG1fY2xhc3MgPSBRdENsYXNz OjpjbGFzc0Zvck9iamVjdChtX29iamVjdCk7CisgICAgfQogICAgIHJldHVybiBtX2NsYXNzOwog fQpAQCAtMjQ0LDExICsyNDYsMTMgQEAgSlNWYWx1ZSBRdEluc3RhbmNlOjpkZWZhdWx0VmFsdWUo RXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlIGhpbnQpIGMKIAogSlNWYWx1 ZSBRdEluc3RhbmNlOjpzdHJpbmdWYWx1ZShFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CiB7CisgICAg UU9iamVjdCogb2JqID0gZ2V0T2JqZWN0KCk7CisgICAgaWYgKCFvYmopCisgICAgICAgIHJldHVy biBqc051bGwoKTsKICAgICAvLyBIbW0uLiBzZWUgaWYgdGhlcmUgaXMgYSB0b1N0cmluZyBkZWZp bmVkCiAgICAgUUJ5dGVBcnJheSBidWY7CiAgICAgYm9vbCB1c2VEZWZhdWx0ID0gdHJ1ZTsKICAg ICBnZXRDbGFzcygpOwotICAgIFFPYmplY3QqIG9iaiA9IGdldE9iamVjdCgpOwogICAgIGlmICht X2NsYXNzICYmIG9iaikgewogICAgICAgICAvLyBDaGVhdCBhbmQgZG9uJ3QgdXNlIHRoZSBmdWxs IG5hbWUgcmVzb2x1dGlvbgogICAgICAgICBpbnQgaW5kZXggPSBvYmotPm1ldGFPYmplY3QoKS0+ aW5kZXhPZk1ldGhvZCgidG9TdHJpbmcoKSIpOwpAQCAtMjk0LDcgKzI5OCw3IEBAIEpTVmFsdWUg UXRJbnN0YW5jZTo6bnVtYmVyVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogSlNWYWx1ZSBR dEluc3RhbmNlOjpib29sZWFuVmFsdWUoKSBjb25zdAogewogICAgIC8vIEVDTUEgOS4yCi0gICAg cmV0dXJuIGpzQm9vbGVhbih0cnVlKTsKKyAgICByZXR1cm4ganNCb29sZWFuKGdldE9iamVjdCgp ICE9IDApOwogfQogCiBKU1ZhbHVlIFF0SW5zdGFuY2U6OnZhbHVlT2YoRXhlY1N0YXRlKiBleGVj KSBjb25zdAotLSAKMS42LjQuNAoK 50338 2010-03-09 12:08:16 -0800 2010-04-08 09:45:50 -0700 Bug Test Program bug34730-test.zip application/zip 1009 bruno.schmidt UEsDBBQAAAAIAIqBaTzjKeWbIwEAAAgCAAAMABwAYnVnMzQ3MzAuY3BwVVQJAAOTnZZLlJ2WS3V4 CwABBOgDAAAE6AMAAH1QXUvDMBR9Xn5FyMClc7bCBGGtBRGmKLgVp3vZy20aumiWhCzdHMP/brMP 54T5kpvzwbmH2xSKyargmORV2b267l6GU4JQc08nmbuvRJTdGiMFAye0So/UMc+fhIuyer4Jvjwp DqHkJ8W+hdkf9U5bHmWvVqYICeXwDISi/gO2ZB3MpmBxu+3RIkBr1PjdEIMxdOvb6DFCjRGfu0H+ zpnD2uN9Ybyonxg1/AhNXZIGF6lftunkARTFSD/CAl6YFcaNhSr0chtFiatjSQef6eDfjDl3D24m KUlyXaywVlJDcTMhILl1tOXL9XDrHPu4IMY7evDR23Gh0u65knJotaml1cHTByEPriPLhKRJ5Pel 5KfdfKqXdHOQ+kYh/+TMoy/0DVBLAwQUAAAACADrgGk8/YCsEMUAAAB6AQAACgAcAGJ1ZzM0NzMw LmhVVAkAA2mclktrnJZLdXgLAAEE6AMAAAToAwAAdZBNC4JAEIbPzq8Y8GJdFAqCjCBNig75gR06 SepIG8sa63oI8b9nZGFFc5p5Z553htFZIXIq0DlsJtPZxEq2oHc1EzSUQGci43VOuAiVW0oyQz+9 UKaWABk/VRXGVKmnBNocr3XKWYb9EDSghYnv7Dw3fmRB5AdeFB+Nvj9GUap9zXkgyytJdcPIW62/ xdEf9Jf7gJ6nzDv4zzKjM+4O1CSpWgpUZ1bZoLUwJD7HsY/mnb2i97Dsd6eF1gadRM4KNM3hT+9Q SwMEFAAAAAgAx4BpPJhPvVsvAAAAOwAAAAwAHABidWczNDczMC5wcm9VVAkAAyaclksqnJZLdXgL AAEE6AMAAAToAwAACwxR0LZVKE9Nys4s4fJwdXRxDQoGiSSVphubmBsb6GVwBfuHBjm7ooomFxRw AQBQSwECHgMUAAAACACKgWk84ynlmyMBAAAIAgAADAAYAAAAAAABAAAApIEAAAAAYnVnMzQ3MzAu Y3BwVVQFAAOTnZZLdXgLAAEE6AMAAAToAwAAUEsBAh4DFAAAAAgA64BpPP2ArBDFAAAAegEAAAoA GAAAAAAAAQAAAKSBaQEAAGJ1ZzM0NzMwLmhVVAUAA2mclkt1eAsAAQToAwAABOgDAABQSwECHgMU AAAACADHgGk8mE+9Wy8AAAA7AAAADAAYAAAAAAABAAAApIFyAgAAYnVnMzQ3MzAucHJvVVQFAAMm nJZLdXgLAAEE6AMAAAToAwAAUEsFBgAAAAADAAMA9AAAAOcCAAAAAA== 52876 2010-04-08 09:45:50 -0700 2010-04-08 10:51:46 -0700 Updated patch with changelog and testcases. qtwebkit-NullProperty.patch text/plain 8520 bruno.schmidt ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmNmMTNlMy4uMzZhNWFhNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0wOCAgQnJ1bm8gU2NobWlk dCAgPGJydW5vLnNjaG1pZHRAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFFPYmplY3RzIGV4cG9ydGVkIHRvIHRoZSBRV2Via2l0IGph dmFzY3JpcHQgd2l0aCBwcm9wZXJ0aWVzIHRoYXQgYXJlIGEgbnVsbCAiUU9iamVjdCoiIGNhdXNl IFNlZ21lbnRhdGlvbiBGYXVsdC4KKworICAgICAgICBJZiBhbiBRT2JqZWN0IGlzIGFkZGVkIHRv IHRoZSBqYXZhc2NyaXB0IGNvbnRleHQgYW5kIGl0IGNvbnRhaW5zIHByb3BlcnRpZXMgb2YgdGhl IHR5cGUgUU9iamVjdCogd2l0aCBOVUxMIHZhbHVlLCBjYWxsaW5nIHRoZSBwcm9wZXJ0eSBjYXVz ZXMgU2VnbWVudGF0aW9uIEZhdWx0LgorICAgICAgICBTbyBub3cgdGhlIGNvZGUgY2hlY2tzIGZv ciBvYmplY3RzIHdoaWNoIGFyZSBudWxsIGFuZCB0aHJlYXQgdGhlbSBhY2NvcmRpbmdseToKKyAg ICAgICAgICogUXRJbnN0YW5jZTo6Z2V0Q2xhc3MoKSBtYXkgcmV0dXJuIE5VTEwKKyAgICAgICAg ICogUXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBtYXkgcmV0dXJuIGpz TnVsbCgpCisgICAgICAgICAqIFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgpIG1heSByZXR1cm4g ZmFsc2UuCisgICAgICAgICAqIGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoLi4uKSBRT2JqZWN0U3Rh ciBjb252ZXJzaW9uIHJldHVybnMganNOdWxsKCkgaWYgb2JqIGlzIG51bGwKKworICAgICAgICBb UXRdIE51bGwgUU9iamVjdHMgcHJvcGVydGllcyBjYXVzZSBTZWdtZW50YXRpb24gRmF1bHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzMwCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfaW5z dGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0Q2xhc3Mp OgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUpOgorICAg ICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Ym9vbGVhblZhbHVlKToKKyAgICAgICAg KiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252 ZXJ0VmFsdWVUb1FWYXJpYW50KToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OmNvbnZlcnRRVmFy aWFudFRvVmFsdWUpOgorCiAyMDEwLTAzLTI5ICBKYW5uZSBLb3NraW5lbiAgPGphbm5lLnAua29z a2luZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwIGIvV2ViQ29yZS9i cmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IDNkZjZhODkuLjk5ZmFmMmMgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAorKysgYi9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAKQEAgLTE3MSw4ICsxNzEsMTEgQEAgUXRJbnN0YW5jZSogUXRJ bnN0YW5jZTo6Z2V0SW5zdGFuY2UoSlNPYmplY3QqIG9iamVjdCkKIAogQ2xhc3MqIFF0SW5zdGFu Y2U6OmdldENsYXNzKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fY2xhc3MpCisgICAgaWYgKCFtX2Ns YXNzKSB7CisgICAgICAgIGlmICghbV9vYmplY3QpCisgICAgICAgICAgICByZXR1cm4gMDsKICAg ICAgICAgbV9jbGFzcyA9IFF0Q2xhc3M6OmNsYXNzRm9yT2JqZWN0KG1fb2JqZWN0KTsKKyAgICB9 CiAgICAgcmV0dXJuIG1fY2xhc3M7CiB9CiAKQEAgLTI1NywxMSArMjYwLDE0IEBAIEpTVmFsdWUg UXRJbnN0YW5jZTo6ZGVmYXVsdFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUHJlZmVycmVkUHJpbWl0 aXZlVHlwZSBoaW50KSBjCiAKIEpTVmFsdWUgUXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAogeworICAgIFFPYmplY3QqIG9iaiA9IGdldE9iamVjdCgpOworICAg IGlmKCFvYmopCisgICAgICAgIHJldHVybiBqc051bGwoKTsKKwogICAgIC8vIEhtbS4uIHNlZSBp ZiB0aGVyZSBpcyBhIHRvU3RyaW5nIGRlZmluZWQKICAgICBRQnl0ZUFycmF5IGJ1ZjsKICAgICBi b29sIHVzZURlZmF1bHQgPSB0cnVlOwogICAgIGdldENsYXNzKCk7Ci0gICAgUU9iamVjdCogb2Jq ID0gZ2V0T2JqZWN0KCk7CiAgICAgaWYgKG1fY2xhc3MgJiYgb2JqKSB7CiAgICAgICAgIC8vIENo ZWF0IGFuZCBkb24ndCB1c2UgdGhlIGZ1bGwgbmFtZSByZXNvbHV0aW9uCiAgICAgICAgIGludCBp bmRleCA9IG9iai0+bWV0YU9iamVjdCgpLT5pbmRleE9mTWV0aG9kKCJ0b1N0cmluZygpIik7CkBA IC0zMDcsNyArMzEzLDcgQEAgSlNWYWx1ZSBRdEluc3RhbmNlOjpudW1iZXJWYWx1ZShFeGVjU3Rh dGUqIGV4ZWMpIGNvbnN0CiBKU1ZhbHVlIFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgpIGNvbnN0 CiB7CiAgICAgLy8gRUNNQSA5LjIKLSAgICByZXR1cm4ganNCb29sZWFuKHRydWUpOworICAgIHJl dHVybiBqc0Jvb2xlYW4oZ2V0T2JqZWN0KCkgIT0gMCk7CiB9CiAKIEpTVmFsdWUgUXRJbnN0YW5j ZTo6dmFsdWVPZihFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jy aWRnZS9xdC9xdF9ydW50aW1lLmNwcCBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3Bw CmluZGV4IDNiZDUxOTAuLmEzOTI4ZmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0 X3J1bnRpbWUuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCkBAIC0z MzIsNyArMzMyLDcgQEAgUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFyaWFudChFeGVjU3RhdGUq IGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6VHlwZQogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KIAotICAgICAgICBjYXNlIFFNZXRhVHlwZTo6UVZhcmlhbnRNYXA6IAorICAg ICAgICBjYXNlIFFNZXRhVHlwZTo6UVZhcmlhbnRNYXA6CiAgICAgICAgICAgICBpZiAodHlwZSA9 PSBPYmplY3QgfHwgdHlwZSA9PSBBcnJheSB8fCB0eXBlID09IFJUQXJyYXkpIHsKICAgICAgICAg ICAgICAgICAvLyBFbnVtZXJhdGUgdGhlIGNvbnRlbnRzIG9mIHRoZSBvYmplY3QKICAgICAgICAg ICAgICAgICBQcm9wZXJ0eU5hbWVBcnJheSBwcm9wZXJ0aWVzKGV4ZWMpOwpAQCAtODcxLDYgKzg3 MSw4IEBAIEpTVmFsdWUgY29udmVydFFWYXJpYW50VG9WYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIFBh c3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdCwgY29uCiAKICAgICBpZiAodHlwZSA9PSBRTWV0YVR5 cGU6OlFPYmplY3RTdGFyIHx8IHR5cGUgPT0gUU1ldGFUeXBlOjpRV2lkZ2V0U3RhcikgewogICAg ICAgICBRT2JqZWN0KiBvYmogPSB2YXJpYW50LnZhbHVlPFFPYmplY3QqPigpOworICAgICAgICBp ZiAob2JqID09IDApCisgICAgICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAgICAgICAgIHJldHVy biBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKG9iaiwgcm9vdCwgUVNjcmlwdEVuZ2luZTo6UXRP d25lcnNoaXApLT5jcmVhdGVSdW50aW1lT2JqZWN0KGV4ZWMpOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggM2E0YjA5 Ni4uNWViZDNlYyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQv cXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDQtMDggIEJydW5vIFNjaG1pZHQg IDxicnVuby5zY2htaWR0QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBRT2JqZWN0cyBleHBvcnRlZCB0byB0aGUgUVdlYmtpdCBqYXZh c2NyaXB0IHdpdGggcHJvcGVydGllcyB0aGF0IGFyZSBhIG51bGwgIlFPYmplY3QqIiBjYXVzZSBT ZWdtZW50YXRpb24gRmF1bHQuCisKKyAgICAgICAgSWYgYW4gUU9iamVjdCBpcyBhZGRlZCB0byB0 aGUgamF2YXNjcmlwdCBjb250ZXh0IGFuZCBpdCBjb250YWlucyBwcm9wZXJ0aWVzIG9mIHRoZSB0 eXBlIFFPYmplY3QqIHdpdGggTlVMTCB2YWx1ZSwgY2FsbGluZyB0aGUgcHJvcGVydHkgY2F1c2Vz IFNlZ21lbnRhdGlvbiBGYXVsdC4KKyAgICAgICAgU28gbm93IHRoZSBjb2RlIGNoZWNrcyBmb3Ig b2JqZWN0cyB3aGljaCBhcmUgbnVsbCBhbmQgdGhyZWF0IHRoZW0gYWNjb3JkaW5nbHk6CisgICAg ICAgICAqIFF0SW5zdGFuY2U6OmdldENsYXNzKCkgbWF5IHJldHVybiBOVUxMCisgICAgICAgICAq IFF0SW5zdGFuY2U6OnN0cmluZ1ZhbHVlKEV4ZWNTdGF0ZSogZXhlYykgbWF5IHJldHVybiBqc051 bGwoKQorICAgICAgICAgKiBRdEluc3RhbmNlOjpib29sZWFuVmFsdWUoKSBtYXkgcmV0dXJuIGZh bHNlLgorICAgICAgICAgKiBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKC4uLikgUU9iamVjdFN0YXIg Y29udmVyc2lvbiByZXR1cm5zIGpzTnVsbCgpIGlmIG9iaiBpcyBudWxsCisKKyAgICAgICAgW1F0 XSBOdWxsIFFPYmplY3RzIHByb3BlcnRpZXMgY2F1c2UgU2VnbWVudGF0aW9uIEZhdWx0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDczMAorCisgICAg ICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoTXlRT2Jq ZWN0OjpNeVFPYmplY3QpOgorICAgICAgICAoTXlRT2JqZWN0OjpvYmplY3RTdGFyUHJvcGVydHkp OgorICAgICAgICAoTXlRT2JqZWN0OjpzZXRPYmplY3RTdGFyUHJvcGVydHkpOgorCiAyMDEwLTAz LTI2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KZGlmZiAtLWdpdCBhL1dlYktpdC9x dC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvdGVzdHMvcXdl YmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IDM3ZjdiODguLjY2M2ZiYzEgMTAwNjQ0Ci0t LSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKKysrIGIvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtNjcsNiArNjcsNyBA QCBjbGFzcyBNeVFPYmplY3QgOiBwdWJsaWMgUU9iamVjdAogICAgIFFfUFJPUEVSVFkoUUtleVNl cXVlbmNlIHNob3J0Y3V0IFJFQUQgc2hvcnRjdXQgV1JJVEUgc2V0U2hvcnRjdXQpCiAgICAgUV9Q Uk9QRVJUWShDdXN0b21UeXBlIHByb3BXaXRoQ3VzdG9tVHlwZSBSRUFEIHByb3BXaXRoQ3VzdG9t VHlwZSBXUklURSBzZXRQcm9wV2l0aEN1c3RvbVR5cGUpCiAgICAgUV9QUk9QRVJUWShRV2ViRWxl bWVudCB3ZWJFbGVtZW50UHJvcGVydHkgUkVBRCB3ZWJFbGVtZW50UHJvcGVydHkgV1JJVEUgc2V0 V2ViRWxlbWVudFByb3BlcnR5KQorICAgIFFfUFJPUEVSVFkoUU9iamVjdCogb2JqZWN0U3RhclBy b3BlcnR5IFJFQUQgb2JqZWN0U3RhclByb3BlcnR5IFdSSVRFIHNldE9iamVjdFN0YXJQcm9wZXJ0 eSkKICAgICBRX0VOVU1TKFBvbGljeSBTdHJhdGVneSkKICAgICBRX0ZMQUdTKEFiaWxpdHkpCiAK QEAgLTEwNCw2ICsxMDUsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX2hpZGRlblZhbHVlKDQ1 Ni4wKSwKICAgICAgICAgICAgIG1fd3JpdGVPbmx5VmFsdWUoNzg5KSwKICAgICAgICAgICAgIG1f cmVhZE9ubHlWYWx1ZSg5ODcpLAorICAgICAgICBtX29iamVjdFN0YXIoMCksCiAgICAgICAgICAg ICBtX3F0RnVuY3Rpb25JbnZva2VkKC0xKSB7IH0KIAogICAgIH5NeVFPYmplY3QoKSB7IH0KQEAg LTE5Nyw2ICsxOTksMTUgQEAgcHVibGljOgogICAgICAgICBtX2N1c3RvbVR5cGUgPSBjOwogICAg IH0KIAorICAgIFFPYmplY3QqIG9iamVjdFN0YXJQcm9wZXJ0eSgpIGNvbnN0IHsKKyAgICAgICAg cmV0dXJuIG1fb2JqZWN0U3RhcjsKKyAgICB9CisKKyAgICB2b2lkIHNldE9iamVjdFN0YXJQcm9w ZXJ0eShRT2JqZWN0KiBvYmplY3QpIHsKKyAgICAgICAgbV9vYmplY3RTdGFyID0gb2JqZWN0Owor ICAgIH0KKworCiAgICAgaW50IHF0RnVuY3Rpb25JbnZva2VkKCkgY29uc3QgewogICAgICAgICBy ZXR1cm4gbV9xdEZ1bmN0aW9uSW52b2tlZDsKICAgICB9CkBAIC00ODIsNiArNDkzLDcgQEAgcHJp dmF0ZToKICAgICBRS2V5U2VxdWVuY2UgbV9zaG9ydGN1dDsKICAgICBRV2ViRWxlbWVudCBtX3dl YkVsZW1lbnQ7CiAgICAgQ3VzdG9tVHlwZSBtX2N1c3RvbVR5cGU7CisgICAgUU9iamVjdCogbV9v YmplY3RTdGFyOwogICAgIGludCBtX3F0RnVuY3Rpb25JbnZva2VkOwogICAgIFFWYXJpYW50TGlz dCBtX2FjdHVhbHM7CiB9OwpAQCAtNjU0LDYgKzY2Niw3IEBAIHByaXZhdGU6CiAgICAgY29uc3Qg UVN0cmluZyBzU3RyaW5nOwogICAgIGNvbnN0IFFTdHJpbmcgc09iamVjdDsKICAgICBjb25zdCBR U3RyaW5nIHNOdW1iZXI7CisgICAgY29uc3QgUVN0cmluZyBzTnVsbDsKIAogcHJpdmF0ZToKICAg ICBRV2ViVmlldyogbV92aWV3OwpAQCAtNjY1LDcgKzY3OCw3IEBAIHByaXZhdGU6CiAKIHRzdF9R V2ViRnJhbWU6OnRzdF9RV2ViRnJhbWUoKQogICAgIDogc1RydWUoInRydWUiKSwgc0ZhbHNlKCJm YWxzZSIpLCBzVW5kZWZpbmVkKCJ1bmRlZmluZWQiKSwgc0FycmF5KCJhcnJheSIpLCBzRnVuY3Rp b24oImZ1bmN0aW9uIiksIHNFcnJvcigiZXJyb3IiKSwKLSAgICAgICAgc1N0cmluZygic3RyaW5n IiksIHNPYmplY3QoIm9iamVjdCIpLCBzTnVtYmVyKCJudW1iZXIiKSwgbV9wb3B1cFRlc3RWaWV3 KDApLCBtX3BvcHVwVGVzdFBhaW50Q291bnQoMCkKKyAgICAgICAgc1N0cmluZygic3RyaW5nIiks IHNPYmplY3QoIm9iamVjdCIpLCBzTnVtYmVyKCJudW1iZXIiKSwgc051bGwoIm51bGwiKSwgbV9w b3B1cFRlc3RWaWV3KDApLCBtX3BvcHVwVGVzdFBhaW50Q291bnQoMCkKIHsKIH0KIApAQCAtODc3 LDYgKzg5MCwyMCBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldFN0YXRpY1Byb3BlcnR5KCkK ICAgICBRQ09NUEFSRShldmFsSlMoIm15T2JqZWN0LnJlYWRPbmx5UHJvcGVydHkgPSA2NTQ7Igog ICAgICAgICAgICAgICAgICAgICAibXlPYmplY3QucmVhZE9ubHlQcm9wZXJ0eSA9PSA5ODciKSwg c1RydWUpOwogICAgIFFDT01QQVJFKG1fbXlPYmplY3QtPnJlYWRPbmx5UHJvcGVydHkoKSwgOTg3 KTsKKworICAgIC8vIFFPYmplY3QqIHByb3BlcnR5CisgICAgbV9teU9iamVjdC0+c2V0T2JqZWN0 U3RhclByb3BlcnR5KDApOworICAgIFFDT01QQVJFKG1fbXlPYmplY3QtPm9iamVjdFN0YXJQcm9w ZXJ0eSgpLCAoUU9iamVjdCopMCk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5vYmpl Y3RTdGFyUHJvcGVydHkgPT0gbnVsbCIpLCBzVHJ1ZSk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJ0 eXBlb2YgbXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5IiksIHNPYmplY3QpOworICAgIFFDT01Q QVJFKGV2YWxKUygiQm9vbGVhbihteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkpIiksIHNGYWxz ZSk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJTdHJpbmcobXlPYmplY3Qub2JqZWN0U3RhclByb3Bl cnR5KSA9PSAnbnVsbCciKSwgc1RydWUpOworICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3Qu b2JqZWN0U3RhclByb3BlcnR5Lm9iamVjdFN0YXJQcm9wZXJ0eSIpLCBzVW5kZWZpbmVkKTsKKyAg ICBtX215T2JqZWN0LT5zZXRPYmplY3RTdGFyUHJvcGVydHkodGhpcyk7CisgICAgUUNPTVBBUkUo ZXZhbEpTKCJteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkgIT0gbnVsbCIpLCBzVHJ1ZSk7Cisg ICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5Iiks IHNPYmplY3QpOworICAgIFFDT01QQVJFKGV2YWxKUygiQm9vbGVhbihteU9iamVjdC5vYmplY3RT dGFyUHJvcGVydHkpIiksIHNUcnVlKTsKKyAgICBRQ09NUEFSRShldmFsSlMoIlN0cmluZyhteU9i amVjdC5vYmplY3RTdGFyUHJvcGVydHkpICE9ICdudWxsJyIpLCBzVHJ1ZSk7CiB9CiAKIHZvaWQg dHN0X1FXZWJGcmFtZTo6Z2V0U2V0RHluYW1pY1Byb3BlcnR5KCkKQEAgLTI4MDcsNyArMjgzNCw3 IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6ZXZhbHVhdGVXaWxsQ2F1c2VSZXBhaW50KCkKICNpZiBR VF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkKICAgICBRVGVzdDo6cVdhaXRG b3JXaW5kb3dTaG93bigmdmlldyk7CiAjZWxzZQotICAgIFFUZXN0OjpxV2FpdCgyMDAwKTsgCisg ICAgUVRlc3Q6OnFXYWl0KDIwMDApOwogI2VuZGlmCiAKICAgICB2aWV3LnBhZ2UoKS0+bWFpbkZy YW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgK 52877 2010-04-08 10:51:46 -0700 2010-04-09 14:37:29 -0700 Rebased and changed coding style. qtwebkit-NullProperty2.patch text/plain 8516 bruno.schmidt ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDM5ZjA1Ni4uNjViNDk3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNC0wOCAgQnJ1bm8gU2NobWlk dCAgPGJydW5vLnNjaG1pZHRAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFFPYmplY3RzIGV4cG9ydGVkIHRvIHRoZSBRV2Via2l0IGph dmFzY3JpcHQgd2l0aCBwcm9wZXJ0aWVzIHRoYXQgYXJlIGEgbnVsbCAiUU9iamVjdCoiIGNhdXNl IFNlZ21lbnRhdGlvbiBGYXVsdC4KKworICAgICAgICBJZiBhbiBRT2JqZWN0IGlzIGFkZGVkIHRv IHRoZSBqYXZhc2NyaXB0IGNvbnRleHQgYW5kIGl0IGNvbnRhaW5zIHByb3BlcnRpZXMgb2YgdGhl IHR5cGUgUU9iamVjdCogd2l0aCBOVUxMIHZhbHVlLCBjYWxsaW5nIHRoZSBwcm9wZXJ0eSBjYXVz ZXMgU2VnbWVudGF0aW9uIEZhdWx0LgorICAgICAgICBTbyBub3cgdGhlIGNvZGUgY2hlY2tzIGZv ciBvYmplY3RzIHdoaWNoIGFyZSBudWxsIGFuZCB0aHJlYXQgdGhlbSBhY2NvcmRpbmdseToKKyAg ICAgICAgICogUXRJbnN0YW5jZTo6Z2V0Q2xhc3MoKSBtYXkgcmV0dXJuIE5VTEwKKyAgICAgICAg ICogUXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBtYXkgcmV0dXJuIGpz TnVsbCgpCisgICAgICAgICAqIFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgpIG1heSByZXR1cm4g ZmFsc2UuCisgICAgICAgICAqIGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoLi4uKSBRT2JqZWN0U3Rh ciBjb252ZXJzaW9uIHJldHVybnMganNOdWxsKCkgaWYgb2JqIGlzIG51bGwKKworICAgICAgICBb UXRdIE51bGwgUU9iamVjdHMgcHJvcGVydGllcyBjYXVzZSBTZWdtZW50YXRpb24gRmF1bHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzMwCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfaW5z dGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0Q2xhc3Mp OgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUpOgorICAg ICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Ym9vbGVhblZhbHVlKToKKyAgICAgICAg KiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252 ZXJ0VmFsdWVUb1FWYXJpYW50KToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OmNvbnZlcnRRVmFy aWFudFRvVmFsdWUpOgorCiAyMDEwLTA0LTA4ICBKYXJra28gU2Fra2luZW4gIDxqYXJra28uc2Fr a2luZW5AdGlldG8uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwIGIvV2ViQ29yZS9i cmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IDNkZjZhODkuLmZiZGZlYWMgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAorKysgYi9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAKQEAgLTE3MSw4ICsxNzEsMTEgQEAgUXRJbnN0YW5jZSogUXRJ bnN0YW5jZTo6Z2V0SW5zdGFuY2UoSlNPYmplY3QqIG9iamVjdCkKIAogQ2xhc3MqIFF0SW5zdGFu Y2U6OmdldENsYXNzKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fY2xhc3MpCisgICAgaWYgKCFtX2Ns YXNzKSB7CisgICAgICAgIGlmICghbV9vYmplY3QpCisgICAgICAgICAgICByZXR1cm4gMDsKICAg ICAgICAgbV9jbGFzcyA9IFF0Q2xhc3M6OmNsYXNzRm9yT2JqZWN0KG1fb2JqZWN0KTsKKyAgICB9 CiAgICAgcmV0dXJuIG1fY2xhc3M7CiB9CiAKQEAgLTI1NywxMSArMjYwLDE0IEBAIEpTVmFsdWUg UXRJbnN0YW5jZTo6ZGVmYXVsdFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUHJlZmVycmVkUHJpbWl0 aXZlVHlwZSBoaW50KSBjCiAKIEpTVmFsdWUgUXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAogeworICAgIFFPYmplY3QqIG9iaiA9IGdldE9iamVjdCgpOworICAg IGlmICghb2JqKQorICAgICAgICByZXR1cm4ganNOdWxsKCk7CisKICAgICAvLyBIbW0uLiBzZWUg aWYgdGhlcmUgaXMgYSB0b1N0cmluZyBkZWZpbmVkCiAgICAgUUJ5dGVBcnJheSBidWY7CiAgICAg Ym9vbCB1c2VEZWZhdWx0ID0gdHJ1ZTsKICAgICBnZXRDbGFzcygpOwotICAgIFFPYmplY3QqIG9i aiA9IGdldE9iamVjdCgpOwogICAgIGlmIChtX2NsYXNzICYmIG9iaikgewogICAgICAgICAvLyBD aGVhdCBhbmQgZG9uJ3QgdXNlIHRoZSBmdWxsIG5hbWUgcmVzb2x1dGlvbgogICAgICAgICBpbnQg aW5kZXggPSBvYmotPm1ldGFPYmplY3QoKS0+aW5kZXhPZk1ldGhvZCgidG9TdHJpbmcoKSIpOwpA QCAtMzA3LDcgKzMxMyw3IEBAIEpTVmFsdWUgUXRJbnN0YW5jZTo6bnVtYmVyVmFsdWUoRXhlY1N0 YXRlKiBleGVjKSBjb25zdAogSlNWYWx1ZSBRdEluc3RhbmNlOjpib29sZWFuVmFsdWUoKSBjb25z dAogewogICAgIC8vIEVDTUEgOS4yCi0gICAgcmV0dXJuIGpzQm9vbGVhbih0cnVlKTsKKyAgICBy ZXR1cm4ganNCb29sZWFuKGdldE9iamVjdCgpID8gdHJ1ZSA6IGZhbHNlKTsKIH0KIAogSlNWYWx1 ZSBRdEluc3RhbmNlOjp2YWx1ZU9mKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKZGlmZiAtLWdpdCBh L1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRf cnVudGltZS5jcHAKaW5kZXggM2JkNTE5MC4uNDBmZjZhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i cmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGlt ZS5jcHAKQEAgLTMzMiw3ICszMzIsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50 KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGNhc2UgUU1ldGFUeXBlOjpRVmFyaWFu dE1hcDogCisgICAgICAgIGNhc2UgUU1ldGFUeXBlOjpRVmFyaWFudE1hcDoKICAgICAgICAgICAg IGlmICh0eXBlID09IE9iamVjdCB8fCB0eXBlID09IEFycmF5IHx8IHR5cGUgPT0gUlRBcnJheSkg ewogICAgICAgICAgICAgICAgIC8vIEVudW1lcmF0ZSB0aGUgY29udGVudHMgb2YgdGhlIG9iamVj dAogICAgICAgICAgICAgICAgIFByb3BlcnR5TmFtZUFycmF5IHByb3BlcnRpZXMoZXhlYyk7CkBA IC04NzEsNiArODcxLDggQEAgSlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0 ZSogZXhlYywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290LCBjb24KIAogICAgIGlmICh0eXBl ID09IFFNZXRhVHlwZTo6UU9iamVjdFN0YXIgfHwgdHlwZSA9PSBRTWV0YVR5cGU6OlFXaWRnZXRT dGFyKSB7CiAgICAgICAgIFFPYmplY3QqIG9iaiA9IHZhcmlhbnQudmFsdWU8UU9iamVjdCo+KCk7 CisgICAgICAgIGlmICghb2JqKQorICAgICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgICAg ICByZXR1cm4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShvYmosIHJvb3QsIFFTY3JpcHRFbmdp bmU6OlF0T3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4 IDdiY2YzMTguLjYxODhiNTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEwLTA0LTA4ICBCcnVubyBT Y2htaWR0ICA8YnJ1bm8uc2NobWlkdEBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUU9iamVjdHMgZXhwb3J0ZWQgdG8gdGhlIFFXZWJr aXQgamF2YXNjcmlwdCB3aXRoIHByb3BlcnRpZXMgdGhhdCBhcmUgYSBudWxsICJRT2JqZWN0KiIg Y2F1c2UgU2VnbWVudGF0aW9uIEZhdWx0LgorCisgICAgICAgIElmIGFuIFFPYmplY3QgaXMgYWRk ZWQgdG8gdGhlIGphdmFzY3JpcHQgY29udGV4dCBhbmQgaXQgY29udGFpbnMgcHJvcGVydGllcyBv ZiB0aGUgdHlwZSBRT2JqZWN0KiB3aXRoIE5VTEwgdmFsdWUsIGNhbGxpbmcgdGhlIHByb3BlcnR5 IGNhdXNlcyBTZWdtZW50YXRpb24gRmF1bHQuCisgICAgICAgIFNvIG5vdyB0aGUgY29kZSBjaGVj a3MgZm9yIG9iamVjdHMgd2hpY2ggYXJlIG51bGwgYW5kIHRocmVhdCB0aGVtIGFjY29yZGluZ2x5 OgorICAgICAgICAgKiBRdEluc3RhbmNlOjpnZXRDbGFzcygpIG1heSByZXR1cm4gTlVMTAorICAg ICAgICAgKiBRdEluc3RhbmNlOjpzdHJpbmdWYWx1ZShFeGVjU3RhdGUqIGV4ZWMpIG1heSByZXR1 cm4ganNOdWxsKCkKKyAgICAgICAgICogUXRJbnN0YW5jZTo6Ym9vbGVhblZhbHVlKCkgbWF5IHJl dHVybiBmYWxzZS4KKyAgICAgICAgICogY29udmVydFFWYXJpYW50VG9WYWx1ZSguLi4pIFFPYmpl Y3RTdGFyIGNvbnZlcnNpb24gcmV0dXJucyBqc051bGwoKSBpZiBvYmogaXMgbnVsbAorCisgICAg ICAgIFtRdF0gTnVsbCBRT2JqZWN0cyBwcm9wZXJ0aWVzIGNhdXNlIFNlZ21lbnRhdGlvbiBGYXVs dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ3MzAK KworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKKyAgICAgICAg KE15UU9iamVjdDo6TXlRT2JqZWN0KToKKyAgICAgICAgKE15UU9iamVjdDo6b2JqZWN0U3RhclBy b3BlcnR5KToKKyAgICAgICAgKE15UU9iamVjdDo6c2V0T2JqZWN0U3RhclByb3BlcnR5KToKKwog MjAxMC0wNC0wOCAgSm9lIExpZ21hbiAgPGpvc2VwaC5saWdtYW5Abm9raWEuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rl c3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggMzdmN2I4OC4uNjYzZmJjMSAxMDA2NDQKLS0tIGEv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQv cXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02Nyw2ICs2Nyw3IEBAIGNs YXNzIE15UU9iamVjdCA6IHB1YmxpYyBRT2JqZWN0CiAgICAgUV9QUk9QRVJUWShRS2V5U2VxdWVu Y2Ugc2hvcnRjdXQgUkVBRCBzaG9ydGN1dCBXUklURSBzZXRTaG9ydGN1dCkKICAgICBRX1BST1BF UlRZKEN1c3RvbVR5cGUgcHJvcFdpdGhDdXN0b21UeXBlIFJFQUQgcHJvcFdpdGhDdXN0b21UeXBl IFdSSVRFIHNldFByb3BXaXRoQ3VzdG9tVHlwZSkKICAgICBRX1BST1BFUlRZKFFXZWJFbGVtZW50 IHdlYkVsZW1lbnRQcm9wZXJ0eSBSRUFEIHdlYkVsZW1lbnRQcm9wZXJ0eSBXUklURSBzZXRXZWJF bGVtZW50UHJvcGVydHkpCisgICAgUV9QUk9QRVJUWShRT2JqZWN0KiBvYmplY3RTdGFyUHJvcGVy dHkgUkVBRCBvYmplY3RTdGFyUHJvcGVydHkgV1JJVEUgc2V0T2JqZWN0U3RhclByb3BlcnR5KQog ICAgIFFfRU5VTVMoUG9saWN5IFN0cmF0ZWd5KQogICAgIFFfRkxBR1MoQWJpbGl0eSkKIApAQCAt MTA0LDYgKzEwNSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1faGlkZGVuVmFsdWUoNDU2LjAp LAogICAgICAgICAgICAgbV93cml0ZU9ubHlWYWx1ZSg3ODkpLAogICAgICAgICAgICAgbV9yZWFk T25seVZhbHVlKDk4NyksCisgICAgICAgIG1fb2JqZWN0U3RhcigwKSwKICAgICAgICAgICAgIG1f cXRGdW5jdGlvbkludm9rZWQoLTEpIHsgfQogCiAgICAgfk15UU9iamVjdCgpIHsgfQpAQCAtMTk3 LDYgKzE5OSwxNSBAQCBwdWJsaWM6CiAgICAgICAgIG1fY3VzdG9tVHlwZSA9IGM7CiAgICAgfQog CisgICAgUU9iamVjdCogb2JqZWN0U3RhclByb3BlcnR5KCkgY29uc3QgeworICAgICAgICByZXR1 cm4gbV9vYmplY3RTdGFyOworICAgIH0KKworICAgIHZvaWQgc2V0T2JqZWN0U3RhclByb3BlcnR5 KFFPYmplY3QqIG9iamVjdCkgeworICAgICAgICBtX29iamVjdFN0YXIgPSBvYmplY3Q7CisgICAg fQorCisKICAgICBpbnQgcXRGdW5jdGlvbkludm9rZWQoKSBjb25zdCB7CiAgICAgICAgIHJldHVy biBtX3F0RnVuY3Rpb25JbnZva2VkOwogICAgIH0KQEAgLTQ4Miw2ICs0OTMsNyBAQCBwcml2YXRl OgogICAgIFFLZXlTZXF1ZW5jZSBtX3Nob3J0Y3V0OwogICAgIFFXZWJFbGVtZW50IG1fd2ViRWxl bWVudDsKICAgICBDdXN0b21UeXBlIG1fY3VzdG9tVHlwZTsKKyAgICBRT2JqZWN0KiBtX29iamVj dFN0YXI7CiAgICAgaW50IG1fcXRGdW5jdGlvbkludm9rZWQ7CiAgICAgUVZhcmlhbnRMaXN0IG1f YWN0dWFsczsKIH07CkBAIC02NTQsNiArNjY2LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBRU3Ry aW5nIHNTdHJpbmc7CiAgICAgY29uc3QgUVN0cmluZyBzT2JqZWN0OwogICAgIGNvbnN0IFFTdHJp bmcgc051bWJlcjsKKyAgICBjb25zdCBRU3RyaW5nIHNOdWxsOwogCiBwcml2YXRlOgogICAgIFFX ZWJWaWV3KiBtX3ZpZXc7CkBAIC02NjUsNyArNjc4LDcgQEAgcHJpdmF0ZToKIAogdHN0X1FXZWJG cmFtZTo6dHN0X1FXZWJGcmFtZSgpCiAgICAgOiBzVHJ1ZSgidHJ1ZSIpLCBzRmFsc2UoImZhbHNl IiksIHNVbmRlZmluZWQoInVuZGVmaW5lZCIpLCBzQXJyYXkoImFycmF5IiksIHNGdW5jdGlvbigi ZnVuY3Rpb24iKSwgc0Vycm9yKCJlcnJvciIpLAotICAgICAgICBzU3RyaW5nKCJzdHJpbmciKSwg c09iamVjdCgib2JqZWN0IiksIHNOdW1iZXIoIm51bWJlciIpLCBtX3BvcHVwVGVzdFZpZXcoMCks IG1fcG9wdXBUZXN0UGFpbnRDb3VudCgwKQorICAgICAgICBzU3RyaW5nKCJzdHJpbmciKSwgc09i amVjdCgib2JqZWN0IiksIHNOdW1iZXIoIm51bWJlciIpLCBzTnVsbCgibnVsbCIpLCBtX3BvcHVw VGVzdFZpZXcoMCksIG1fcG9wdXBUZXN0UGFpbnRDb3VudCgwKQogewogfQogCkBAIC04NzcsNiAr ODkwLDIwIEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6Z2V0U2V0U3RhdGljUHJvcGVydHkoKQogICAg IFFDT01QQVJFKGV2YWxKUygibXlPYmplY3QucmVhZE9ubHlQcm9wZXJ0eSA9IDY1NDsiCiAgICAg ICAgICAgICAgICAgICAgICJteU9iamVjdC5yZWFkT25seVByb3BlcnR5ID09IDk4NyIpLCBzVHJ1 ZSk7CiAgICAgUUNPTVBBUkUobV9teU9iamVjdC0+cmVhZE9ubHlQcm9wZXJ0eSgpLCA5ODcpOwor CisgICAgLy8gUU9iamVjdCogcHJvcGVydHkKKyAgICBtX215T2JqZWN0LT5zZXRPYmplY3RTdGFy UHJvcGVydHkoMCk7CisgICAgUUNPTVBBUkUobV9teU9iamVjdC0+b2JqZWN0U3RhclByb3BlcnR5 KCksIChRT2JqZWN0KikwKTsKKyAgICBRQ09NUEFSRShldmFsSlMoIm15T2JqZWN0Lm9iamVjdFN0 YXJQcm9wZXJ0eSA9PSBudWxsIiksIHNUcnVlKTsKKyAgICBRQ09NUEFSRShldmFsSlMoInR5cGVv ZiBteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkiKSwgc09iamVjdCk7CisgICAgUUNPTVBBUkUo ZXZhbEpTKCJCb29sZWFuKG15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eSkiKSwgc0ZhbHNlKTsK KyAgICBRQ09NUEFSRShldmFsSlMoIlN0cmluZyhteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkp ID09ICdudWxsJyIpLCBzVHJ1ZSk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5vYmpl Y3RTdGFyUHJvcGVydHkub2JqZWN0U3RhclByb3BlcnR5IiksIHNVbmRlZmluZWQpOworICAgIG1f bXlPYmplY3QtPnNldE9iamVjdFN0YXJQcm9wZXJ0eSh0aGlzKTsKKyAgICBRQ09NUEFSRShldmFs SlMoIm15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eSAhPSBudWxsIiksIHNUcnVlKTsKKyAgICBR Q09NUEFSRShldmFsSlMoInR5cGVvZiBteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkiKSwgc09i amVjdCk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJCb29sZWFuKG15T2JqZWN0Lm9iamVjdFN0YXJQ cm9wZXJ0eSkiKSwgc1RydWUpOworICAgIFFDT01QQVJFKGV2YWxKUygiU3RyaW5nKG15T2JqZWN0 Lm9iamVjdFN0YXJQcm9wZXJ0eSkgIT0gJ251bGwnIiksIHNUcnVlKTsKIH0KIAogdm9pZCB0c3Rf UVdlYkZyYW1lOjpnZXRTZXREeW5hbWljUHJvcGVydHkoKQpAQCAtMjgwNyw3ICsyODM0LDcgQEAg dm9pZCB0c3RfUVdlYkZyYW1lOjpldmFsdWF0ZVdpbGxDYXVzZVJlcGFpbnQoKQogI2lmIFFUX1ZF UlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgIFFUZXN0OjpxV2FpdEZvcldp bmRvd1Nob3duKCZ2aWV3KTsKICNlbHNlCi0gICAgUVRlc3Q6OnFXYWl0KDIwMDApOyAKKyAgICBR VGVzdDo6cVdhaXQoMjAwMCk7CiAjZW5kaWYKIAogICAgIHZpZXcucGFnZSgpLT5tYWluRnJhbWUo KS0+ZXZhbHVhdGVKYXZhU2NyaXB0KAo= 52989 2010-04-09 14:37:29 -0700 2010-04-14 14:51:00 -0700 Fixed the reported patch problems qtwebkit-NullProperty.patch text/plain 7869 bruno.schmidt ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDM5ZjA1Ni4uNjViNDk3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNC0wOCAgQnJ1bm8gU2NobWlk dCAgPGJydW5vLnNjaG1pZHRAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFFPYmplY3RzIGV4cG9ydGVkIHRvIHRoZSBRV2Via2l0IGph dmFzY3JpcHQgd2l0aCBwcm9wZXJ0aWVzIHRoYXQgYXJlIGEgbnVsbCAiUU9iamVjdCoiIGNhdXNl IFNlZ21lbnRhdGlvbiBGYXVsdC4KKworICAgICAgICBJZiBhbiBRT2JqZWN0IGlzIGFkZGVkIHRv IHRoZSBqYXZhc2NyaXB0IGNvbnRleHQgYW5kIGl0IGNvbnRhaW5zIHByb3BlcnRpZXMgb2YgdGhl IHR5cGUgUU9iamVjdCogd2l0aCBOVUxMIHZhbHVlLCBjYWxsaW5nIHRoZSBwcm9wZXJ0eSBjYXVz ZXMgU2VnbWVudGF0aW9uIEZhdWx0LgorICAgICAgICBTbyBub3cgdGhlIGNvZGUgY2hlY2tzIGZv ciBvYmplY3RzIHdoaWNoIGFyZSBudWxsIGFuZCB0aHJlYXQgdGhlbSBhY2NvcmRpbmdseToKKyAg ICAgICAgICogUXRJbnN0YW5jZTo6Z2V0Q2xhc3MoKSBtYXkgcmV0dXJuIE5VTEwKKyAgICAgICAg ICogUXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBtYXkgcmV0dXJuIGpz TnVsbCgpCisgICAgICAgICAqIFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgpIG1heSByZXR1cm4g ZmFsc2UuCisgICAgICAgICAqIGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoLi4uKSBRT2JqZWN0U3Rh ciBjb252ZXJzaW9uIHJldHVybnMganNOdWxsKCkgaWYgb2JqIGlzIG51bGwKKworICAgICAgICBb UXRdIE51bGwgUU9iamVjdHMgcHJvcGVydGllcyBjYXVzZSBTZWdtZW50YXRpb24gRmF1bHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzMwCisKKyAg ICAgICAgKiBicmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5n czo6UXRJbnN0YW5jZTo6Z2V0Q2xhc3MpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0 YW5jZTo6c3RyaW5nVmFsdWUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6 Ym9vbGVhblZhbHVlKToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAg ICAgIChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0VmFsdWVUb1FWYXJpYW50KToKKyAgICAgICAgKEpT Qzo6QmluZGluZ3M6OmNvbnZlcnRRVmFyaWFudFRvVmFsdWUpOgorCiAyMDEwLTA0LTA4ICBKYXJr a28gU2Fra2luZW4gIDxqYXJra28uc2Fra2luZW5AdGlldG8uY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRf aW5zdGFuY2UuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IDNk ZjZhODkuLmZiZGZlYWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNl LmNwcAorKysgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKQEAgLTE3MSw4ICsx NzEsMTEgQEAgUXRJbnN0YW5jZSogUXRJbnN0YW5jZTo6Z2V0SW5zdGFuY2UoSlNPYmplY3QqIG9i amVjdCkKIAogQ2xhc3MqIFF0SW5zdGFuY2U6OmdldENsYXNzKCkgY29uc3QKIHsKLSAgICBpZiAo IW1fY2xhc3MpCisgICAgaWYgKCFtX2NsYXNzKSB7CisgICAgICAgIGlmICghbV9vYmplY3QpCisg ICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgbV9jbGFzcyA9IFF0Q2xhc3M6OmNsYXNzRm9y T2JqZWN0KG1fb2JqZWN0KTsKKyAgICB9CiAgICAgcmV0dXJuIG1fY2xhc3M7CiB9CiAKQEAgLTI1 NywxMSArMjYwLDE0IEBAIEpTVmFsdWUgUXRJbnN0YW5jZTo6ZGVmYXVsdFZhbHVlKEV4ZWNTdGF0 ZSogZXhlYywgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSBoaW50KSBjCiAKIEpTVmFsdWUgUXRJbnN0 YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogeworICAgIFFPYmplY3Qq IG9iaiA9IGdldE9iamVjdCgpOworICAgIGlmICghb2JqKQorICAgICAgICByZXR1cm4ganNOdWxs KCk7CisKICAgICAvLyBIbW0uLiBzZWUgaWYgdGhlcmUgaXMgYSB0b1N0cmluZyBkZWZpbmVkCiAg ICAgUUJ5dGVBcnJheSBidWY7CiAgICAgYm9vbCB1c2VEZWZhdWx0ID0gdHJ1ZTsKICAgICBnZXRD bGFzcygpOwotICAgIFFPYmplY3QqIG9iaiA9IGdldE9iamVjdCgpOwogICAgIGlmIChtX2NsYXNz ICYmIG9iaikgewogICAgICAgICAvLyBDaGVhdCBhbmQgZG9uJ3QgdXNlIHRoZSBmdWxsIG5hbWUg cmVzb2x1dGlvbgogICAgICAgICBpbnQgaW5kZXggPSBvYmotPm1ldGFPYmplY3QoKS0+aW5kZXhP Zk1ldGhvZCgidG9TdHJpbmcoKSIpOwpAQCAtMzA3LDcgKzMxMyw3IEBAIEpTVmFsdWUgUXRJbnN0 YW5jZTo6bnVtYmVyVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogSlNWYWx1ZSBRdEluc3Rh bmNlOjpib29sZWFuVmFsdWUoKSBjb25zdAogewogICAgIC8vIEVDTUEgOS4yCi0gICAgcmV0dXJu IGpzQm9vbGVhbih0cnVlKTsKKyAgICByZXR1cm4ganNCb29sZWFuKGdldE9iamVjdCgpKTsKIH0K IAogSlNWYWx1ZSBRdEluc3RhbmNlOjp2YWx1ZU9mKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvV2ViQ29yZS9icmlk Z2UvcXQvcXRfcnVudGltZS5jcHAKaW5kZXggM2JkNTE5MC4uNDBmZjZhMSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvV2ViQ29yZS9icmlkZ2UvcXQv cXRfcnVudGltZS5jcHAKQEAgLTMzMiw3ICszMzIsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVU b1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBl CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGNhc2UgUU1ldGFUeXBl OjpRVmFyaWFudE1hcDogCisgICAgICAgIGNhc2UgUU1ldGFUeXBlOjpRVmFyaWFudE1hcDoKICAg ICAgICAgICAgIGlmICh0eXBlID09IE9iamVjdCB8fCB0eXBlID09IEFycmF5IHx8IHR5cGUgPT0g UlRBcnJheSkgewogICAgICAgICAgICAgICAgIC8vIEVudW1lcmF0ZSB0aGUgY29udGVudHMgb2Yg dGhlIG9iamVjdAogICAgICAgICAgICAgICAgIFByb3BlcnR5TmFtZUFycmF5IHByb3BlcnRpZXMo ZXhlYyk7CkBAIC04NzEsNiArODcxLDggQEAgSlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVl KEV4ZWNTdGF0ZSogZXhlYywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290LCBjb24KIAogICAg IGlmICh0eXBlID09IFFNZXRhVHlwZTo6UU9iamVjdFN0YXIgfHwgdHlwZSA9PSBRTWV0YVR5cGU6 OlFXaWRnZXRTdGFyKSB7CiAgICAgICAgIFFPYmplY3QqIG9iaiA9IHZhcmlhbnQudmFsdWU8UU9i amVjdCo+KCk7CisgICAgICAgIGlmICghb2JqKQorICAgICAgICAgICAgcmV0dXJuIGpzTnVsbCgp OwogICAgICAgICByZXR1cm4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShvYmosIHJvb3QsIFFT Y3JpcHRFbmdpbmU6OlF0T3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IDdiY2YzMTguLjYxODhiNTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEwLTA0LTA4 ICBCcnVubyBTY2htaWR0ICA8YnJ1bm8uc2NobWlkdEBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUU9iamVjdHMgZXhwb3J0ZWQgdG8g dGhlIFFXZWJraXQgamF2YXNjcmlwdCB3aXRoIHByb3BlcnRpZXMgdGhhdCBhcmUgYSBudWxsICJR T2JqZWN0KiIgY2F1c2UgU2VnbWVudGF0aW9uIEZhdWx0LgorCisgICAgICAgIElmIGFuIFFPYmpl Y3QgaXMgYWRkZWQgdG8gdGhlIGphdmFzY3JpcHQgY29udGV4dCBhbmQgaXQgY29udGFpbnMgcHJv cGVydGllcyBvZiB0aGUgdHlwZSBRT2JqZWN0KiB3aXRoIE5VTEwgdmFsdWUsIGNhbGxpbmcgdGhl IHByb3BlcnR5IGNhdXNlcyBTZWdtZW50YXRpb24gRmF1bHQuCisgICAgICAgIFNvIG5vdyB0aGUg Y29kZSBjaGVja3MgZm9yIG9iamVjdHMgd2hpY2ggYXJlIG51bGwgYW5kIHRocmVhdCB0aGVtIGFj Y29yZGluZ2x5OgorICAgICAgICAgKiBRdEluc3RhbmNlOjpnZXRDbGFzcygpIG1heSByZXR1cm4g TlVMTAorICAgICAgICAgKiBRdEluc3RhbmNlOjpzdHJpbmdWYWx1ZShFeGVjU3RhdGUqIGV4ZWMp IG1heSByZXR1cm4ganNOdWxsKCkKKyAgICAgICAgICogUXRJbnN0YW5jZTo6Ym9vbGVhblZhbHVl KCkgbWF5IHJldHVybiBmYWxzZS4KKyAgICAgICAgICogY29udmVydFFWYXJpYW50VG9WYWx1ZSgu Li4pIFFPYmplY3RTdGFyIGNvbnZlcnNpb24gcmV0dXJucyBqc051bGwoKSBpZiBvYmogaXMgbnVs bAorCisgICAgICAgIFtRdF0gTnVsbCBRT2JqZWN0cyBwcm9wZXJ0aWVzIGNhdXNlIFNlZ21lbnRh dGlvbiBGYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzQ3MzAKKworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKE15UU9iamVjdDo6TXlRT2JqZWN0KToKKyAgICAgICAgKE15UU9iamVjdDo6b2Jq ZWN0U3RhclByb3BlcnR5KToKKyAgICAgICAgKE15UU9iamVjdDo6c2V0T2JqZWN0U3RhclByb3Bl cnR5KToKKwogMjAxMC0wNC0wOCAgSm9lIExpZ21hbiAgPGpvc2VwaC5saWdtYW5Abm9raWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC90ZXN0 cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggMzdmN2I4OC4uNjYzZmJjMSAxMDA2 NDQKLS0tIGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysg Yi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02Nyw2ICs2 Nyw3IEBAIGNsYXNzIE15UU9iamVjdCA6IHB1YmxpYyBRT2JqZWN0CiAgICAgUV9QUk9QRVJUWShR S2V5U2VxdWVuY2Ugc2hvcnRjdXQgUkVBRCBzaG9ydGN1dCBXUklURSBzZXRTaG9ydGN1dCkKICAg ICBRX1BST1BFUlRZKEN1c3RvbVR5cGUgcHJvcFdpdGhDdXN0b21UeXBlIFJFQUQgcHJvcFdpdGhD dXN0b21UeXBlIFdSSVRFIHNldFByb3BXaXRoQ3VzdG9tVHlwZSkKICAgICBRX1BST1BFUlRZKFFX ZWJFbGVtZW50IHdlYkVsZW1lbnRQcm9wZXJ0eSBSRUFEIHdlYkVsZW1lbnRQcm9wZXJ0eSBXUklU RSBzZXRXZWJFbGVtZW50UHJvcGVydHkpCisgICAgUV9QUk9QRVJUWShRT2JqZWN0KiBvYmplY3RT dGFyUHJvcGVydHkgUkVBRCBvYmplY3RTdGFyUHJvcGVydHkgV1JJVEUgc2V0T2JqZWN0U3RhclBy b3BlcnR5KQogICAgIFFfRU5VTVMoUG9saWN5IFN0cmF0ZWd5KQogICAgIFFfRkxBR1MoQWJpbGl0 eSkKIApAQCAtMTA0LDYgKzEwNSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1faGlkZGVuVmFs dWUoNDU2LjApLAogICAgICAgICAgICAgbV93cml0ZU9ubHlWYWx1ZSg3ODkpLAogICAgICAgICAg ICAgbV9yZWFkT25seVZhbHVlKDk4NyksCisgICAgICAgICAgICBtX29iamVjdFN0YXIoMCksCiAg ICAgICAgICAgICBtX3F0RnVuY3Rpb25JbnZva2VkKC0xKSB7IH0KIAogICAgIH5NeVFPYmplY3Qo KSB7IH0KQEAgLTE5Nyw2ICsxOTksMTUgQEAgcHVibGljOgogICAgICAgICBtX2N1c3RvbVR5cGUg PSBjOwogICAgIH0KIAorICAgIFFPYmplY3QqIG9iamVjdFN0YXJQcm9wZXJ0eSgpIGNvbnN0IHsK KyAgICAgICAgcmV0dXJuIG1fb2JqZWN0U3RhcjsKKyAgICB9CisKKyAgICB2b2lkIHNldE9iamVj dFN0YXJQcm9wZXJ0eShRT2JqZWN0KiBvYmplY3QpIHsKKyAgICAgICAgbV9vYmplY3RTdGFyID0g b2JqZWN0OworICAgIH0KKworCiAgICAgaW50IHF0RnVuY3Rpb25JbnZva2VkKCkgY29uc3Qgewog ICAgICAgICByZXR1cm4gbV9xdEZ1bmN0aW9uSW52b2tlZDsKICAgICB9CkBAIC00ODIsNiArNDkz LDcgQEAgcHJpdmF0ZToKICAgICBRS2V5U2VxdWVuY2UgbV9zaG9ydGN1dDsKICAgICBRV2ViRWxl bWVudCBtX3dlYkVsZW1lbnQ7CiAgICAgQ3VzdG9tVHlwZSBtX2N1c3RvbVR5cGU7CisgICAgUU9i amVjdCogbV9vYmplY3RTdGFyOwogICAgIGludCBtX3F0RnVuY3Rpb25JbnZva2VkOwogICAgIFFW YXJpYW50TGlzdCBtX2FjdHVhbHM7CiB9OwpAQCAtODc3LDYgKzg4OSwyMCBAQCB2b2lkIHRzdF9R V2ViRnJhbWU6OmdldFNldFN0YXRpY1Byb3BlcnR5KCkKICAgICBRQ09NUEFSRShldmFsSlMoIm15 T2JqZWN0LnJlYWRPbmx5UHJvcGVydHkgPSA2NTQ7IgogICAgICAgICAgICAgICAgICAgICAibXlP YmplY3QucmVhZE9ubHlQcm9wZXJ0eSA9PSA5ODciKSwgc1RydWUpOwogICAgIFFDT01QQVJFKG1f bXlPYmplY3QtPnJlYWRPbmx5UHJvcGVydHkoKSwgOTg3KTsKKworICAgIC8vIFFPYmplY3QqIHBy b3BlcnR5CisgICAgbV9teU9iamVjdC0+c2V0T2JqZWN0U3RhclByb3BlcnR5KDApOworICAgIFFD T01QQVJFKG1fbXlPYmplY3QtPm9iamVjdFN0YXJQcm9wZXJ0eSgpLCAoUU9iamVjdCopMCk7Cisg ICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkgPT0gbnVsbCIp LCBzVHJ1ZSk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3Qub2JqZWN0U3Rh clByb3BlcnR5IiksIHNPYmplY3QpOworICAgIFFDT01QQVJFKGV2YWxKUygiQm9vbGVhbihteU9i amVjdC5vYmplY3RTdGFyUHJvcGVydHkpIiksIHNGYWxzZSk7CisgICAgUUNPTVBBUkUoZXZhbEpT KCJTdHJpbmcobXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5KSA9PSAnbnVsbCciKSwgc1RydWUp OworICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5Lm9iamVj dFN0YXJQcm9wZXJ0eSIpLCBzVW5kZWZpbmVkKTsKKyAgICBtX215T2JqZWN0LT5zZXRPYmplY3RT dGFyUHJvcGVydHkodGhpcyk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5vYmplY3RT dGFyUHJvcGVydHkgIT0gbnVsbCIpLCBzVHJ1ZSk7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBl b2YgbXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5IiksIHNPYmplY3QpOworICAgIFFDT01QQVJF KGV2YWxKUygiQm9vbGVhbihteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkpIiksIHNUcnVlKTsK KyAgICBRQ09NUEFSRShldmFsSlMoIlN0cmluZyhteU9iamVjdC5vYmplY3RTdGFyUHJvcGVydHkp ICE9ICdudWxsJyIpLCBzVHJ1ZSk7CiB9CiAKIHZvaWQgdHN0X1FXZWJGcmFtZTo6Z2V0U2V0RHlu YW1pY1Byb3BlcnR5KCkKQEAgLTI4MDcsNyArMjgzMyw3IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6 ZXZhbHVhdGVXaWxsQ2F1c2VSZXBhaW50KCkKICNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05f Q0hFQ0soNCwgNiwgMCkKICAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmdmlldyk7CiAj ZWxzZQotICAgIFFUZXN0OjpxV2FpdCgyMDAwKTsgCisgICAgUVRlc3Q6OnFXYWl0KDIwMDApOwog I2VuZGlmCiAKICAgICB2aWV3LnBhZ2UoKS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlw dCgK 53370 2010-04-14 14:51:00 -0700 2010-04-14 17:31:44 -0700 Patch with the corrections requested by Kenneth Rohde Christiansen qtwebkit-NullProperty.patch text/plain 7858 bruno.schmidt ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDM5ZjA1Ni4uNjViNDk3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0wNC0wOCAgQnJ1bm8gU2NobWlk dCAgPGJydW5vLnNjaG1pZHRAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gTnVsbCBRT2JqZWN0cyBwcm9wZXJ0aWVzIGNhdXNl IFNlZ21lbnRhdGlvbiBGYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzQ3MzAKKworICAgICAgICBRT2JqZWN0cyBleHBvcnRlZCB0byB0aGUgUVdl YmtpdCBqYXZhc2NyaXB0IHdpdGggcHJvcGVydGllcyB0aGF0IGFyZQorICAgICAgICBhIG51bGwg IlFPYmplY3QqIiBjYXVzZSBTZWdtZW50YXRpb24gRmF1bHQuCisKKyAgICAgICAgSWYgYW4gUU9i amVjdCBpcyBhZGRlZCB0byB0aGUgamF2YXNjcmlwdCBjb250ZXh0IGFuZCBpdCBjb250YWlucwor ICAgICAgICBwcm9wZXJ0aWVzIG9mIHRoZSB0eXBlIFFPYmplY3QqIHdpdGggTlVMTCB2YWx1ZSwg Y2FsbGluZyB0aGUgcHJvcGVydHkKKyAgICAgICAgY2F1c2VzIFNlZ21lbnRhdGlvbiBGYXVsdC4K KyAgICAgICAgU28gbm93IHRoZSBjb2RlIGJlbG93IHByb3Blcmx5IGNoZWNrcyBmb3IgbnVsbCBw b2ludGVyczoKKyAgICAgICAgIC0gUXRJbnN0YW5jZTo6Z2V0Q2xhc3MoKSBtYXkgcmV0dXJuIE5V TEwKKyAgICAgICAgIC0gUXRJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBt YXkgcmV0dXJuIGpzTnVsbCgpCisgICAgICAgICAtIFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgp IG1heSByZXR1cm4gZmFsc2UuCisgICAgICAgICAtIGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoLi4u KSBRT2JqZWN0U3RhciBjb252ZXJzaW9uIG1heSByZXR1cm4ganNOdWxsCisKKyAgICAgICAgKiBi cmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0 YW5jZTo6Z2V0Q2xhc3MpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6c3Ry aW5nVmFsdWUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Ym9vbGVhblZh bHVlKToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6 OkJpbmRpbmdzOjpjb252ZXJ0VmFsdWVUb1FWYXJpYW50KToKKyAgICAgICAgKEpTQzo6QmluZGlu Z3M6OmNvbnZlcnRRVmFyaWFudFRvVmFsdWUpOgorCiAyMDEwLTA0LTA4ICBKYXJra28gU2Fra2lu ZW4gIDxqYXJra28uc2Fra2luZW5AdGlldG8uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNp bW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2Uu Y3BwIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IDNkZjZhODkuLmZi ZGZlYWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAorKysg Yi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKQEAgLTE3MSw4ICsxNzEsMTEgQEAg UXRJbnN0YW5jZSogUXRJbnN0YW5jZTo6Z2V0SW5zdGFuY2UoSlNPYmplY3QqIG9iamVjdCkKIAog Q2xhc3MqIFF0SW5zdGFuY2U6OmdldENsYXNzKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fY2xhc3Mp CisgICAgaWYgKCFtX2NsYXNzKSB7CisgICAgICAgIGlmICghbV9vYmplY3QpCisgICAgICAgICAg ICByZXR1cm4gMDsKICAgICAgICAgbV9jbGFzcyA9IFF0Q2xhc3M6OmNsYXNzRm9yT2JqZWN0KG1f b2JqZWN0KTsKKyAgICB9CiAgICAgcmV0dXJuIG1fY2xhc3M7CiB9CiAKQEAgLTI1NywxMSArMjYw LDE0IEBAIEpTVmFsdWUgUXRJbnN0YW5jZTo6ZGVmYXVsdFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywg UHJlZmVycmVkUHJpbWl0aXZlVHlwZSBoaW50KSBjCiAKIEpTVmFsdWUgUXRJbnN0YW5jZTo6c3Ry aW5nVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogeworICAgIFFPYmplY3QqIG9iaiA9IGdl dE9iamVjdCgpOworICAgIGlmICghb2JqKQorICAgICAgICByZXR1cm4ganNOdWxsKCk7CisKICAg ICAvLyBIbW0uLiBzZWUgaWYgdGhlcmUgaXMgYSB0b1N0cmluZyBkZWZpbmVkCiAgICAgUUJ5dGVB cnJheSBidWY7CiAgICAgYm9vbCB1c2VEZWZhdWx0ID0gdHJ1ZTsKICAgICBnZXRDbGFzcygpOwot ICAgIFFPYmplY3QqIG9iaiA9IGdldE9iamVjdCgpOwogICAgIGlmIChtX2NsYXNzICYmIG9iaikg ewogICAgICAgICAvLyBDaGVhdCBhbmQgZG9uJ3QgdXNlIHRoZSBmdWxsIG5hbWUgcmVzb2x1dGlv bgogICAgICAgICBpbnQgaW5kZXggPSBvYmotPm1ldGFPYmplY3QoKS0+aW5kZXhPZk1ldGhvZCgi dG9TdHJpbmcoKSIpOwpAQCAtMzA3LDcgKzMxMyw3IEBAIEpTVmFsdWUgUXRJbnN0YW5jZTo6bnVt YmVyVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogSlNWYWx1ZSBRdEluc3RhbmNlOjpib29s ZWFuVmFsdWUoKSBjb25zdAogewogICAgIC8vIEVDTUEgOS4yCi0gICAgcmV0dXJuIGpzQm9vbGVh bih0cnVlKTsKKyAgICByZXR1cm4ganNCb29sZWFuKGdldE9iamVjdCgpKTsKIH0KIAogSlNWYWx1 ZSBRdEluc3RhbmNlOjp2YWx1ZU9mKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKZGlmZiAtLWdpdCBh L1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRf cnVudGltZS5jcHAKaW5kZXggM2JkNTE5MC4uNDBmZjZhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i cmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGlt ZS5jcHAKQEAgLTMzMiw3ICszMzIsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50 KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGNhc2UgUU1ldGFUeXBlOjpRVmFyaWFu dE1hcDogCisgICAgICAgIGNhc2UgUU1ldGFUeXBlOjpRVmFyaWFudE1hcDoKICAgICAgICAgICAg IGlmICh0eXBlID09IE9iamVjdCB8fCB0eXBlID09IEFycmF5IHx8IHR5cGUgPT0gUlRBcnJheSkg ewogICAgICAgICAgICAgICAgIC8vIEVudW1lcmF0ZSB0aGUgY29udGVudHMgb2YgdGhlIG9iamVj dAogICAgICAgICAgICAgICAgIFByb3BlcnR5TmFtZUFycmF5IHByb3BlcnRpZXMoZXhlYyk7CkBA IC04NzEsNiArODcxLDggQEAgSlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0 ZSogZXhlYywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290LCBjb24KIAogICAgIGlmICh0eXBl ID09IFFNZXRhVHlwZTo6UU9iamVjdFN0YXIgfHwgdHlwZSA9PSBRTWV0YVR5cGU6OlFXaWRnZXRT dGFyKSB7CiAgICAgICAgIFFPYmplY3QqIG9iaiA9IHZhcmlhbnQudmFsdWU8UU9iamVjdCo+KCk7 CisgICAgICAgIGlmICghb2JqKQorICAgICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgICAg ICByZXR1cm4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShvYmosIHJvb3QsIFFTY3JpcHRFbmdp bmU6OlF0T3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4 IDdiY2YzMTguLjYxODhiNTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEwLTA0LTA4ICBCcnVubyBT Y2htaWR0ICA8YnJ1bm8uc2NobWlkdEBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBOdWxsIFFPYmplY3RzIHByb3BlcnRpZXMg Y2F1c2UgU2VnbWVudGF0aW9uIEZhdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNDczMAorCisgICAgICAgIFFPYmplY3RzIGV4cG9ydGVkIHRvIHRo ZSBRV2Via2l0IGphdmFzY3JpcHQgd2l0aCBwcm9wZXJ0aWVzIHRoYXQgYXJlCisgICAgICAgIGEg bnVsbCAiUU9iamVjdCoiIGNhdXNlIFNlZ21lbnRhdGlvbiBGYXVsdC4KKworICAgICAgICBJZiBh biBRT2JqZWN0IGlzIGFkZGVkIHRvIHRoZSBqYXZhc2NyaXB0IGNvbnRleHQgYW5kIGl0IGNvbnRh aW5zCisgICAgICAgIHByb3BlcnRpZXMgb2YgdGhlIHR5cGUgUU9iamVjdCogd2l0aCBOVUxMIHZh bHVlLCBjYWxsaW5nIHRoZSBwcm9wZXJ0eQorICAgICAgICBjYXVzZXMgU2VnbWVudGF0aW9uIEZh dWx0LgorICAgICAgICBTbyBub3cgdGhlIGNvZGUgYmVsb3cgcHJvcGVybHkgY2hlY2tzIGZvciBu dWxsIHBvaW50ZXJzOgorICAgICAgICAgLSBRdEluc3RhbmNlOjpnZXRDbGFzcygpIG1heSByZXR1 cm4gTlVMTAorICAgICAgICAgLSBRdEluc3RhbmNlOjpzdHJpbmdWYWx1ZShFeGVjU3RhdGUqIGV4 ZWMpIG1heSByZXR1cm4ganNOdWxsCisgICAgICAgICAtIFF0SW5zdGFuY2U6OmJvb2xlYW5WYWx1 ZSgpIG1heSByZXR1cm4gZmFsc2UuCisgICAgICAgICAtIGNvbnZlcnRRVmFyaWFudFRvVmFsdWUo Li4uKSBRT2JqZWN0U3RhciBjb252ZXJzaW9uIG1heSByZXR1cm4ganNOdWxsCisKKyAgICAgICAg KiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChNeVFPYmplY3Q6 Ok15UU9iamVjdCk6CisgICAgICAgIChNeVFPYmplY3Q6Om9iamVjdFN0YXJQcm9wZXJ0eSk6Cisg ICAgICAgIChNeVFPYmplY3Q6OnNldE9iamVjdFN0YXJQcm9wZXJ0eSk6CisKIDIwMTAtMDQtMDgg IEpvZSBMaWdtYW4gIDxqb3NlcGgubGlnbWFuQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2Vi ZnJhbWUuY3BwCmluZGV4IDM3ZjdiODguLjY2M2ZiYzEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC90 ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtNjcsNiArNjcsNyBAQCBjbGFzcyBNeVFPYmpl Y3QgOiBwdWJsaWMgUU9iamVjdAogICAgIFFfUFJPUEVSVFkoUUtleVNlcXVlbmNlIHNob3J0Y3V0 IFJFQUQgc2hvcnRjdXQgV1JJVEUgc2V0U2hvcnRjdXQpCiAgICAgUV9QUk9QRVJUWShDdXN0b21U eXBlIHByb3BXaXRoQ3VzdG9tVHlwZSBSRUFEIHByb3BXaXRoQ3VzdG9tVHlwZSBXUklURSBzZXRQ cm9wV2l0aEN1c3RvbVR5cGUpCiAgICAgUV9QUk9QRVJUWShRV2ViRWxlbWVudCB3ZWJFbGVtZW50 UHJvcGVydHkgUkVBRCB3ZWJFbGVtZW50UHJvcGVydHkgV1JJVEUgc2V0V2ViRWxlbWVudFByb3Bl cnR5KQorICAgIFFfUFJPUEVSVFkoUU9iamVjdCogb2JqZWN0U3RhclByb3BlcnR5IFJFQUQgb2Jq ZWN0U3RhclByb3BlcnR5IFdSSVRFIHNldE9iamVjdFN0YXJQcm9wZXJ0eSkKICAgICBRX0VOVU1T KFBvbGljeSBTdHJhdGVneSkKICAgICBRX0ZMQUdTKEFiaWxpdHkpCiAKQEAgLTEwNCw2ICsxMDUs NyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX2hpZGRlblZhbHVlKDQ1Ni4wKSwKICAgICAgICAg ICAgIG1fd3JpdGVPbmx5VmFsdWUoNzg5KSwKICAgICAgICAgICAgIG1fcmVhZE9ubHlWYWx1ZSg5 ODcpLAorICAgICAgICAgICAgbV9vYmplY3RTdGFyKDApLAogICAgICAgICAgICAgbV9xdEZ1bmN0 aW9uSW52b2tlZCgtMSkgeyB9CiAKICAgICB+TXlRT2JqZWN0KCkgeyB9CkBAIC0xOTcsNiArMTk5 LDE1IEBAIHB1YmxpYzoKICAgICAgICAgbV9jdXN0b21UeXBlID0gYzsKICAgICB9CiAKKyAgICBR T2JqZWN0KiBvYmplY3RTdGFyUHJvcGVydHkoKSBjb25zdCB7CisgICAgICAgIHJldHVybiBtX29i amVjdFN0YXI7CisgICAgfQorCisgICAgdm9pZCBzZXRPYmplY3RTdGFyUHJvcGVydHkoUU9iamVj dCogb2JqZWN0KSB7CisgICAgICAgIG1fb2JqZWN0U3RhciA9IG9iamVjdDsKKyAgICB9CisKKwog ICAgIGludCBxdEZ1bmN0aW9uSW52b2tlZCgpIGNvbnN0IHsKICAgICAgICAgcmV0dXJuIG1fcXRG dW5jdGlvbkludm9rZWQ7CiAgICAgfQpAQCAtNDgyLDYgKzQ5Myw3IEBAIHByaXZhdGU6CiAgICAg UUtleVNlcXVlbmNlIG1fc2hvcnRjdXQ7CiAgICAgUVdlYkVsZW1lbnQgbV93ZWJFbGVtZW50Owog ICAgIEN1c3RvbVR5cGUgbV9jdXN0b21UeXBlOworICAgIFFPYmplY3QqIG1fb2JqZWN0U3RhcjsK ICAgICBpbnQgbV9xdEZ1bmN0aW9uSW52b2tlZDsKICAgICBRVmFyaWFudExpc3QgbV9hY3R1YWxz OwogfTsKQEAgLTg3Nyw2ICs4ODksMjEgQEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpnZXRTZXRTdGF0 aWNQcm9wZXJ0eSgpCiAgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5yZWFkT25seVByb3Bl cnR5ID0gNjU0OyIKICAgICAgICAgICAgICAgICAgICAgIm15T2JqZWN0LnJlYWRPbmx5UHJvcGVy dHkgPT0gOTg3IiksIHNUcnVlKTsKICAgICBRQ09NUEFSRShtX215T2JqZWN0LT5yZWFkT25seVBy b3BlcnR5KCksIDk4Nyk7CisKKyAgICAvLyBRT2JqZWN0KiBwcm9wZXJ0eQorICAgIG1fbXlPYmpl Y3QtPnNldE9iamVjdFN0YXJQcm9wZXJ0eSgwKTsKKyAgICBRQ09NUEFSRShtX215T2JqZWN0LT5v YmplY3RTdGFyUHJvcGVydHkoKSwgKFFPYmplY3QqKTApOworICAgIFFDT01QQVJFKGV2YWxKUygi bXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5ID09IG51bGwiKSwgc1RydWUpOworICAgIFFDT01Q QVJFKGV2YWxKUygidHlwZW9mIG15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eSIpLCBzT2JqZWN0 KTsKKyAgICBRQ09NUEFSRShldmFsSlMoIkJvb2xlYW4obXlPYmplY3Qub2JqZWN0U3RhclByb3Bl cnR5KSIpLCBzRmFsc2UpOworICAgIFFDT01QQVJFKGV2YWxKUygiU3RyaW5nKG15T2JqZWN0Lm9i amVjdFN0YXJQcm9wZXJ0eSkgPT0gJ251bGwnIiksIHNUcnVlKTsKKyAgICBRQ09NUEFSRShldmFs SlMoIm15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eS5vYmplY3RTdGFyUHJvcGVydHkiKSwKKyAg ICAgICAgc1VuZGVmaW5lZCk7CisgICAgbV9teU9iamVjdC0+c2V0T2JqZWN0U3RhclByb3BlcnR5 KHRoaXMpOworICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5 ICE9IG51bGwiKSwgc1RydWUpOworICAgIFFDT01QQVJFKGV2YWxKUygidHlwZW9mIG15T2JqZWN0 Lm9iamVjdFN0YXJQcm9wZXJ0eSIpLCBzT2JqZWN0KTsKKyAgICBRQ09NUEFSRShldmFsSlMoIkJv b2xlYW4obXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5KSIpLCBzVHJ1ZSk7CisgICAgUUNPTVBB UkUoZXZhbEpTKCJTdHJpbmcobXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5KSAhPSAnbnVsbCci KSwgc1RydWUpOwogfQogCiB2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldER5bmFtaWNQcm9wZXJ0 eSgpCkBAIC0yODA3LDcgKzI4MzQsNyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OmV2YWx1YXRlV2ls bENhdXNlUmVwYWludCgpCiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYs IDApCiAgICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93U2hvd24oJnZpZXcpOwogI2Vsc2UKLSAgICBR VGVzdDo6cVdhaXQoMjAwMCk7IAorICAgIFFUZXN0OjpxV2FpdCgyMDAwKTsKICNlbmRpZgogCiAg ICAgdmlldy5wYWdlKCktPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoCg== 53387 2010-04-14 17:31:44 -0700 2010-04-15 03:03:39 -0700 Patch with the corrections requested by Kenneth (Comment #18) qtwebkit-NullProperty.patch text/plain 8098 bruno.schmidt ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDM5ZjA1Ni4uMTJjMGZhNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNC0wOCAgQnJ1bm8gU2NobWlk dCAgPGJydW5vLnNjaG1pZHRAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gTnVsbCBRT2JqZWN0cyBwcm9wZXJ0aWVzIGNhdXNl IFNlZ21lbnRhdGlvbiBGYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzQ3MzAKKworICAgICAgICBRT2JqZWN0cyBleHBvcnRlZCB0byB0aGUgUVdl YmtpdCBqYXZhc2NyaXB0IHdpdGggcHJvcGVydGllcyB0aGF0IGFyZQorICAgICAgICBhIG51bGwg IlFPYmplY3QqIiBjYXVzZSBTZWdtZW50YXRpb24gRmF1bHQuCisKKyAgICAgICAgSWYgYW4gUU9i amVjdCBpcyBhZGRlZCB0byB0aGUgamF2YXNjcmlwdCBjb250ZXh0IGFuZCBpdCBjb250YWlucwor ICAgICAgICBwcm9wZXJ0aWVzIG9mIHRoZSB0eXBlIFFPYmplY3QqIHdpdGggTlVMTCB2YWx1ZSwg Y2FsbGluZyB0aGUgcHJvcGVydHkKKyAgICAgICAgY2F1c2VzIFNlZ21lbnRhdGlvbiBGYXVsdC4K KyAgICAgICAgU28gbm93IHRoZSBjb2RlIGJlbG93IHByb3Blcmx5IGNoZWNrcyBmb3IgbnVsbCBw b2ludGVyczoKKworICAgICAgICAqIGJyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHA6CisgICAgICAg IChKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpnZXRDbGFzcyk6IG1heSByZXR1cm4gTlVMTAor ICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0TWV0aG9kKTogbWF5IHJldHVy biBqc051bGwoKQorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6c3RyaW5nVmFs dWUpOiBtYXkgcmV0dXJuIGpzTnVsbCgpCisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEluc3Rh bmNlOjpib29sZWFuVmFsdWUpOiBtYXkgcmV0dXJuIGZhbHNlCisgICAgICAgICogYnJpZGdlL3F0 L3F0X3J1bnRpbWUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Y29udmVydFZhbHVlVG9R VmFyaWFudCk6IAorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Y29udmVydFFWYXJpYW50VG9WYWx1 ZSk6IE1heSByZXR1cm4ganNOdWxsIG9uIFFPYmplY3RTdGFyCisKIDIwMTAtMDQtMDggIEphcmtr byBTYWtraW5lbiAgPGphcmtrby5zYWtraW5lbkB0aWV0by5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9p bnN0YW5jZS5jcHAgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKaW5kZXggM2Rm NmE4OS4uODBiNmE5ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2Uu Y3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMTcxLDYgKzE3 MSw4IEBAIFF0SW5zdGFuY2UqIFF0SW5zdGFuY2U6OmdldEluc3RhbmNlKEpTT2JqZWN0KiBvYmpl Y3QpCiAKIENsYXNzKiBRdEluc3RhbmNlOjpnZXRDbGFzcygpIGNvbnN0CiB7CisgICAgaWYgKCFt X29iamVjdCkKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgaWYgKCFtX2NsYXNzKQogICAgICAgICBt X2NsYXNzID0gUXRDbGFzczo6Y2xhc3NGb3JPYmplY3QobV9vYmplY3QpOwogICAgIHJldHVybiBt X2NsYXNzOwpAQCAtMjM2LDcgKzIzOCw5IEBAIHZvaWQgUXRJbnN0YW5jZTo6Z2V0UHJvcGVydHlO YW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5JiBhcnJheSkKIAogSlNWYWx1 ZSBRdEluc3RhbmNlOjpnZXRNZXRob2QoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVy JiBwcm9wZXJ0eU5hbWUpCiB7Ci0gICAgTWV0aG9kTGlzdCBtZXRob2RMaXN0ID0gZ2V0Q2xhc3Mo KS0+bWV0aG9kc05hbWVkKHByb3BlcnR5TmFtZSwgdGhpcyk7CisgICAgaWYgKCFnZXRDbGFzcygp KQorICAgICAgICByZXR1cm4ganNOdWxsKCk7CisgICAgTWV0aG9kTGlzdCBtZXRob2RMaXN0ID0g bV9jbGFzcy0+bWV0aG9kc05hbWVkKHByb3BlcnR5TmFtZSwgdGhpcyk7CiAgICAgcmV0dXJuIG5l dyAoZXhlYykgUnVudGltZU1ldGhvZChleGVjLCBwcm9wZXJ0eU5hbWUsIG1ldGhvZExpc3QpOwog fQogCkBAIC0yNTcsMTIgKzI2MSwxNSBAQCBKU1ZhbHVlIFF0SW5zdGFuY2U6OmRlZmF1bHRWYWx1 ZShFeGVjU3RhdGUqIGV4ZWMsIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgaGludCkgYwogCiBKU1Zh bHVlIFF0SW5zdGFuY2U6OnN0cmluZ1ZhbHVlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKIHsKKyAg ICBRT2JqZWN0KiBvYmogPSBnZXRPYmplY3QoKTsKKyAgICBpZiAoIW9iaikKKyAgICAgICAgcmV0 dXJuIGpzTnVsbCgpOworCiAgICAgLy8gSG1tLi4gc2VlIGlmIHRoZXJlIGlzIGEgdG9TdHJpbmcg ZGVmaW5lZAogICAgIFFCeXRlQXJyYXkgYnVmOwogICAgIGJvb2wgdXNlRGVmYXVsdCA9IHRydWU7 CiAgICAgZ2V0Q2xhc3MoKTsKLSAgICBRT2JqZWN0KiBvYmogPSBnZXRPYmplY3QoKTsKLSAgICBp ZiAobV9jbGFzcyAmJiBvYmopIHsKKyAgICBpZiAobV9jbGFzcykgewogICAgICAgICAvLyBDaGVh dCBhbmQgZG9uJ3QgdXNlIHRoZSBmdWxsIG5hbWUgcmVzb2x1dGlvbgogICAgICAgICBpbnQgaW5k ZXggPSBvYmotPm1ldGFPYmplY3QoKS0+aW5kZXhPZk1ldGhvZCgidG9TdHJpbmcoKSIpOwogICAg ICAgICBpZiAoaW5kZXggPj0gMCkgewpAQCAtMzA3LDcgKzMxNCw3IEBAIEpTVmFsdWUgUXRJbnN0 YW5jZTo6bnVtYmVyVmFsdWUoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogSlNWYWx1ZSBRdEluc3Rh bmNlOjpib29sZWFuVmFsdWUoKSBjb25zdAogewogICAgIC8vIEVDTUEgOS4yCi0gICAgcmV0dXJu IGpzQm9vbGVhbih0cnVlKTsKKyAgICByZXR1cm4ganNCb29sZWFuKGdldE9iamVjdCgpKTsKIH0K IAogSlNWYWx1ZSBRdEluc3RhbmNlOjp2YWx1ZU9mKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvV2ViQ29yZS9icmlk Z2UvcXQvcXRfcnVudGltZS5jcHAKaW5kZXggM2JkNTE5MC4uNDBmZjZhMSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvV2ViQ29yZS9icmlkZ2UvcXQv cXRfcnVudGltZS5jcHAKQEAgLTMzMiw3ICszMzIsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVU b1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBl CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGNhc2UgUU1ldGFUeXBl OjpRVmFyaWFudE1hcDogCisgICAgICAgIGNhc2UgUU1ldGFUeXBlOjpRVmFyaWFudE1hcDoKICAg ICAgICAgICAgIGlmICh0eXBlID09IE9iamVjdCB8fCB0eXBlID09IEFycmF5IHx8IHR5cGUgPT0g UlRBcnJheSkgewogICAgICAgICAgICAgICAgIC8vIEVudW1lcmF0ZSB0aGUgY29udGVudHMgb2Yg dGhlIG9iamVjdAogICAgICAgICAgICAgICAgIFByb3BlcnR5TmFtZUFycmF5IHByb3BlcnRpZXMo ZXhlYyk7CkBAIC04NzEsNiArODcxLDggQEAgSlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVl KEV4ZWNTdGF0ZSogZXhlYywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290LCBjb24KIAogICAg IGlmICh0eXBlID09IFFNZXRhVHlwZTo6UU9iamVjdFN0YXIgfHwgdHlwZSA9PSBRTWV0YVR5cGU6 OlFXaWRnZXRTdGFyKSB7CiAgICAgICAgIFFPYmplY3QqIG9iaiA9IHZhcmlhbnQudmFsdWU8UU9i amVjdCo+KCk7CisgICAgICAgIGlmICghb2JqKQorICAgICAgICAgICAgcmV0dXJuIGpzTnVsbCgp OwogICAgICAgICByZXR1cm4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShvYmosIHJvb3QsIFFT Y3JpcHRFbmdpbmU6OlF0T3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IDdiY2YzMTguLjljMzEwMjcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEwLTA0LTA4 ICBCcnVubyBTY2htaWR0ICA8YnJ1bm8uc2NobWlkdEBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBOdWxsIFFPYmplY3RzIHBy b3BlcnRpZXMgY2F1c2UgU2VnbWVudGF0aW9uIEZhdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDczMAorCisgICAgICAgIFFPYmplY3RzIGV4cG9y dGVkIHRvIHRoZSBRV2Via2l0IGphdmFzY3JpcHQgd2l0aCBwcm9wZXJ0aWVzIHRoYXQgYXJlCisg ICAgICAgIGEgbnVsbCAiUU9iamVjdCoiIGNhdXNlIFNlZ21lbnRhdGlvbiBGYXVsdC4KKworICAg ICAgICBJZiBhbiBRT2JqZWN0IGlzIGFkZGVkIHRvIHRoZSBqYXZhc2NyaXB0IGNvbnRleHQgYW5k IGl0IGNvbnRhaW5zCisgICAgICAgIHByb3BlcnRpZXMgb2YgdGhlIHR5cGUgUU9iamVjdCogd2l0 aCBOVUxMIHZhbHVlLCBjYWxsaW5nIHRoZSBwcm9wZXJ0eQorICAgICAgICBjYXVzZXMgU2VnbWVu dGF0aW9uIEZhdWx0LgorCisgICAgICAgIEZvbGxvdyB0aGUgdGVzdHMgZm9yIHRoZSBjb3JyZWN0 aW9ucyBkb25lIG92ZXIgV2ViQ29yZS4KKworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3Rf cXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKE15UU9iamVjdDo6TXlRT2JqZWN0KTogaW5pdCB0aGUg ZmllbGQgbV9vYmplY3RTdGFyCisgICAgICAgIChNeVFPYmplY3Q6Om9iamVjdFN0YXJQcm9wZXJ0 eSk6IHJlYWQgdGhlIE9iamVjdCogcHJvcAorICAgICAgICAoTXlRT2JqZWN0OjpzZXRPYmplY3RT dGFyUHJvcGVydHkpOiB3cml0ZSB0aGUgT2JqZWN0KiBwcm9wCisgICAgICAgICh0c3RfUVdlYkZy YW1lOjpnZXRTZXRTdGF0aWNQcm9wZXJ0eSk6IG5ldyB0ZXN0cyBmb3IgdGhlIG5ldyBwcm9wCisK IDIwMTAtMDQtMDggIEpvZSBMaWdtYW4gIDxqb3NlcGgubGlnbWFuQG5va2lhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90 ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IDM3ZjdiODguLjRkMDlhZjcgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtNjcsNiArNjcsNyBAQCBj bGFzcyBNeVFPYmplY3QgOiBwdWJsaWMgUU9iamVjdAogICAgIFFfUFJPUEVSVFkoUUtleVNlcXVl bmNlIHNob3J0Y3V0IFJFQUQgc2hvcnRjdXQgV1JJVEUgc2V0U2hvcnRjdXQpCiAgICAgUV9QUk9Q RVJUWShDdXN0b21UeXBlIHByb3BXaXRoQ3VzdG9tVHlwZSBSRUFEIHByb3BXaXRoQ3VzdG9tVHlw ZSBXUklURSBzZXRQcm9wV2l0aEN1c3RvbVR5cGUpCiAgICAgUV9QUk9QRVJUWShRV2ViRWxlbWVu dCB3ZWJFbGVtZW50UHJvcGVydHkgUkVBRCB3ZWJFbGVtZW50UHJvcGVydHkgV1JJVEUgc2V0V2Vi RWxlbWVudFByb3BlcnR5KQorICAgIFFfUFJPUEVSVFkoUU9iamVjdCogb2JqZWN0U3RhclByb3Bl cnR5IFJFQUQgb2JqZWN0U3RhclByb3BlcnR5IFdSSVRFIHNldE9iamVjdFN0YXJQcm9wZXJ0eSkK ICAgICBRX0VOVU1TKFBvbGljeSBTdHJhdGVneSkKICAgICBRX0ZMQUdTKEFiaWxpdHkpCiAKQEAg LTEwNCw2ICsxMDUsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX2hpZGRlblZhbHVlKDQ1Ni4w KSwKICAgICAgICAgICAgIG1fd3JpdGVPbmx5VmFsdWUoNzg5KSwKICAgICAgICAgICAgIG1fcmVh ZE9ubHlWYWx1ZSg5ODcpLAorICAgICAgICAgICAgbV9vYmplY3RTdGFyKDApLAogICAgICAgICAg ICAgbV9xdEZ1bmN0aW9uSW52b2tlZCgtMSkgeyB9CiAKICAgICB+TXlRT2JqZWN0KCkgeyB9CkBA IC0xOTcsNiArMTk5LDE1IEBAIHB1YmxpYzoKICAgICAgICAgbV9jdXN0b21UeXBlID0gYzsKICAg ICB9CiAKKyAgICBRT2JqZWN0KiBvYmplY3RTdGFyUHJvcGVydHkoKSBjb25zdCB7CisgICAgICAg IHJldHVybiBtX29iamVjdFN0YXI7CisgICAgfQorCisgICAgdm9pZCBzZXRPYmplY3RTdGFyUHJv cGVydHkoUU9iamVjdCogb2JqZWN0KSB7CisgICAgICAgIG1fb2JqZWN0U3RhciA9IG9iamVjdDsK KyAgICB9CisKKwogICAgIGludCBxdEZ1bmN0aW9uSW52b2tlZCgpIGNvbnN0IHsKICAgICAgICAg cmV0dXJuIG1fcXRGdW5jdGlvbkludm9rZWQ7CiAgICAgfQpAQCAtNDgyLDYgKzQ5Myw3IEBAIHBy aXZhdGU6CiAgICAgUUtleVNlcXVlbmNlIG1fc2hvcnRjdXQ7CiAgICAgUVdlYkVsZW1lbnQgbV93 ZWJFbGVtZW50OwogICAgIEN1c3RvbVR5cGUgbV9jdXN0b21UeXBlOworICAgIFFPYmplY3QqIG1f b2JqZWN0U3RhcjsKICAgICBpbnQgbV9xdEZ1bmN0aW9uSW52b2tlZDsKICAgICBRVmFyaWFudExp c3QgbV9hY3R1YWxzOwogfTsKQEAgLTg3Nyw2ICs4ODksMjEgQEAgdm9pZCB0c3RfUVdlYkZyYW1l OjpnZXRTZXRTdGF0aWNQcm9wZXJ0eSgpCiAgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5y ZWFkT25seVByb3BlcnR5ID0gNjU0OyIKICAgICAgICAgICAgICAgICAgICAgIm15T2JqZWN0LnJl YWRPbmx5UHJvcGVydHkgPT0gOTg3IiksIHNUcnVlKTsKICAgICBRQ09NUEFSRShtX215T2JqZWN0 LT5yZWFkT25seVByb3BlcnR5KCksIDk4Nyk7CisKKyAgICAvLyBRT2JqZWN0KiBwcm9wZXJ0eQor ICAgIG1fbXlPYmplY3QtPnNldE9iamVjdFN0YXJQcm9wZXJ0eSgwKTsKKyAgICBRQ09NUEFSRSht X215T2JqZWN0LT5vYmplY3RTdGFyUHJvcGVydHkoKSwgKFFPYmplY3QqKTApOworICAgIFFDT01Q QVJFKGV2YWxKUygibXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5ID09IG51bGwiKSwgc1RydWUp OworICAgIFFDT01QQVJFKGV2YWxKUygidHlwZW9mIG15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0 eSIpLCBzT2JqZWN0KTsKKyAgICBRQ09NUEFSRShldmFsSlMoIkJvb2xlYW4obXlPYmplY3Qub2Jq ZWN0U3RhclByb3BlcnR5KSIpLCBzRmFsc2UpOworICAgIFFDT01QQVJFKGV2YWxKUygiU3RyaW5n KG15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eSkgPT0gJ251bGwnIiksIHNUcnVlKTsKKyAgICBR Q09NUEFSRShldmFsSlMoIm15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eS5vYmplY3RTdGFyUHJv cGVydHkiKSwKKyAgICAgICAgc1VuZGVmaW5lZCk7CisgICAgbV9teU9iamVjdC0+c2V0T2JqZWN0 U3RhclByb3BlcnR5KHRoaXMpOworICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3Qub2JqZWN0 U3RhclByb3BlcnR5ICE9IG51bGwiKSwgc1RydWUpOworICAgIFFDT01QQVJFKGV2YWxKUygidHlw ZW9mIG15T2JqZWN0Lm9iamVjdFN0YXJQcm9wZXJ0eSIpLCBzT2JqZWN0KTsKKyAgICBRQ09NUEFS RShldmFsSlMoIkJvb2xlYW4obXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5KSIpLCBzVHJ1ZSk7 CisgICAgUUNPTVBBUkUoZXZhbEpTKCJTdHJpbmcobXlPYmplY3Qub2JqZWN0U3RhclByb3BlcnR5 KSAhPSAnbnVsbCciKSwgc1RydWUpOwogfQogCiB2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldER5 bmFtaWNQcm9wZXJ0eSgpCkBAIC0yODA3LDcgKzI4MzQsNyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6 OmV2YWx1YXRlV2lsbENhdXNlUmVwYWludCgpCiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9O X0NIRUNLKDQsIDYsIDApCiAgICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93U2hvd24oJnZpZXcpOwog I2Vsc2UKLSAgICBRVGVzdDo6cVdhaXQoMjAwMCk7IAorICAgIFFUZXN0OjpxV2FpdCgyMDAwKTsK ICNlbmRpZgogCiAgICAgdmlldy5wYWdlKCktPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3Jp cHQoCg==