37722 2010-04-16 12:06:11 -0700 Allow to construct HashTraits<WebCore::QualifiedName>::constructDeletedValue 2010-04-24 10:53:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 antonm webkit-unassigned ap commit-queue mjs oldest_to_newest 213353 0 antonm 2010-04-16 12:06:11 -0700 Allow to construct HashTraits<WebCore::QualifiedName>::constructDeletedValue 213360 1 53549 antonm 2010-04-16 12:15:01 -0700 Created attachment 53549 Patch 213361 2 antonm 2010-04-16 12:16:15 -0700 If a patch is fine, is there a way to add a unit test for that? 213461 3 mjs 2010-04-16 15:58:47 -0700 What's this patch trying to accomplish? Is there a problem with the previous behavior? If so, please describe it in the ChangeLog, and in this bug. 213466 4 53549 mjs 2010-04-16 16:03:46 -0700 Comment on attachment 53549 Patch The ChangeLog needs to explain the purpose of this change. I can't tell if this is fixing a bug, changing performance, or just a refactoring change. > Index: WebCore/dom/QualifiedName.cpp > =================================================================== > --- WebCore/dom/QualifiedName.cpp (revision 57720) > +++ WebCore/dom/QualifiedName.cpp (working copy) > @@ -78,6 +78,7 @@ void QualifiedName::deref() > if (!m_impl) > return; > #endif > + ASSERT(m_impl); // HashTableDeletedValue values must be never destructed. Hash table deleted values are generally are generally -1 cast to a pointer rather than 0 cast to a pointer by convention. > > if (m_impl->hasOneRef()) > gNameCache->remove(m_impl); > Index: WebCore/dom/QualifiedName.h > =================================================================== > --- WebCore/dom/QualifiedName.h (revision 57720) > +++ WebCore/dom/QualifiedName.h (working copy) > @@ -58,6 +58,8 @@ public: > > QualifiedName(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI); > QualifiedName(const AtomicString& prefix, const char* localName, const AtomicString& namespaceURI); > + QualifiedName(WTF::HashTableDeletedValueType) : m_impl(0) { } > + bool isHashTableDeletedValue() const { return !m_impl; } > ~QualifiedName() { deref(); } > #ifdef QNAME_DEFAULT_CONSTRUCTOR > QualifiedName() : m_impl(0) { } > @@ -167,7 +169,7 @@ namespace WTF { > template<> struct HashTraits<WebCore::QualifiedName> : GenericHashTraits<WebCore::QualifiedName> { > static const bool emptyValueIsZero = false; > static WebCore::QualifiedName emptyValue() { return WebCore::QualifiedName(WebCore::nullAtom, WebCore::nullAtom, WebCore::nullAtom); } > - static void constructDeletedValue(WebCore::QualifiedName& slot) { new (&slot) WebCore::QualifiedName(WebCore::nullAtom, WebCore::AtomicString(HashTableDeletedValue), WebCore::nullAtom); } > + static void constructDeletedValue(WebCore::QualifiedName& slot) { new (&slot) WebCore::QualifiedName(WTF::HashTableDeletedValue); } > static bool isDeletedValue(const WebCore::QualifiedName& slot) { return slot.localName().isHashTableDeletedValue(); } > }; > } r- for not explaining the purpose of the patch. Please resubmit with an explanation of what bug is being fixed (if any) and a test case of there is a behavior change. 214018 5 53677 antonm 2010-04-19 07:29:46 -0700 Created attachment 53677 Patch 214023 6 antonm 2010-04-19 07:39:21 -0700 Sorry, Maciej, I put explanations into ChangeLog, but that was probably not enough and wrong place. It's not related to performance, it appears to me a bug which we were lucky not to hit. I noticed that while trying to understand what's wrong with node list caching. Sample stack trace: #0 0x0000000100f0bf60 in WebCore::StringImpl::inTable (this=0xffffffffffffffff) at StringImpl.h:168 #1 0x0000000100f0b971 in WebCore::AtomicString::add (r=0xffffffffffffffff) at /Users/chrome-user/WebKit/WebCore/platform/text/AtomicString.cpp:217 #2 0x0000000100f0fc14 in WebCore::AtomicString::AtomicString (this=0x7fff5fbfcad0, imp=0xffffffffffffffff) at AtomicString.h:51 #3 0x00000001016c41ad in WebCore::QNameComponentsTranslator::translate (location=@0x106827728, components=@0x7fff5fbfcd60) at /Users/chrome-user/WebKit/WebCore/dom/QualifiedName.cpp:48 #4 0x00000001016c4232 in WTF::HashSetTranslatorAdapter<WebCore::QualifiedName::QualifiedNameImpl*, WTF::HashTraits<WebCore::QualifiedName::QualifiedNameImpl*>, WebCore::QualifiedNameComponents, WebCore::QNameComponentsTranslator>::translate (location=@0x106827728, key=@0x7fff5fbfcd60, hashCode=234777509) at HashSet.h:111 #5 0x00000001016c434e in WTF::HashTable<WebCore::QualifiedName::QualifiedNameImpl*, WebCore::QualifiedName::QualifiedNameImpl*, WTF::IdentityExtractor<WebCore::QualifiedName::QualifiedNameImpl*>, WebCore::QualifiedNameHash, WTF::HashTraits<WebCore::QualifiedName::QualifiedNameImpl*>, WTF::HashTraits<WebCore::QualifiedName::QualifiedNameImpl*> >::addPassingHashCode<WebCore::QualifiedNameComponents, WebCore::QualifiedNameComponents, WTF::HashSetTranslatorAdapter<WebCore::QualifiedName::QualifiedNameImpl*, WTF::HashTraits<WebCore::QualifiedName::QualifiedNameImpl*>, WebCore::QualifiedNameComponents, WebCore::QNameComponentsTranslator> > (this=0x107016370, key=@0x7fff5fbfcd60, extra=@0x7fff5fbfcd60) at HashTable.h:737 #6 0x00000001016c44e0 in WTF::HashSet<WebCore::QualifiedName::QualifiedNameImpl*, WebCore::QualifiedNameHash, WTF::HashTraits<WebCore::QualifiedName::QualifiedNameImpl*> >::add<WebCore::QualifiedNameComponents, WebCore::QNameComponentsTranslator> (this=0x107016370, value=@0x7fff5fbfcd60) at HashSet.h:219 #7 0x00000001016c2671 in WebCore::QualifiedName::init (this=0x1068238f0, p=@0x102afeb20, l=@0x7fff5fbfcde0, n=@0x102afeb20) at /Users/chrome-user/WebKit/WebCore/dom/QualifiedName.cpp:59 #8 0x00000001016c2784 in WebCore::QualifiedName::QualifiedName (this=0x1068238f0, p=@0x102afeb20, l=@0x7fff5fbfcde0, n=@0x102afeb20) at /Users/chrome-user/WebKit/WebCore/dom/QualifiedName.cpp:67 #9 0x000000010197926d in WTF::HashTraits<WebCore::QualifiedName>::constructDeletedValue (slot=@0x1068238f0) at QualifiedName.h:170 #10 0x0000000101979292 in WTF::PairHashTraits<WTF::HashTraits<WebCore::QualifiedName>, WTF::HashTraits<WebCore::TagNodeList*> >::constructDeletedValue (slot=@0x1068238f0) at HashTraits.h:103 So any attempt to delete a key from hash table keyed by QualifiedName should crash if I understand what goes on correctly---QualifiedName::init would lookup in internal table and this lookup would attempt to search if AtomicString(HashTableDeletedValue) is present in internal tables. Even if we would make that check pass, idea to construct temporary AtomicString(HashTableDeletedValue) appears dubious to me---eventually destructor should run (unless I forgot some other C++ quirk) which is bad idea for any HashTableDeletedValue and would probably crash when derefing underlying StringImpl. I'd be glad to provide a unit test to prove that, but I am lacking knowledge of WebKit testing infrastructure---LayoutTests don't seem to be a tool for me. I've uploaded new patch to address your comment about NULL vs. -1 as a sentinel value. (In reply to comment #4) > (From update of attachment 53549 [details]) > The ChangeLog needs to explain the purpose of this change. I can't tell if this > is fixing a bug, changing performance, or just a refactoring change. > > > Index: WebCore/dom/QualifiedName.cpp > > =================================================================== > > --- WebCore/dom/QualifiedName.cpp (revision 57720) > > +++ WebCore/dom/QualifiedName.cpp (working copy) > > @@ -78,6 +78,7 @@ void QualifiedName::deref() > > if (!m_impl) > > return; > > #endif > > + ASSERT(m_impl); // HashTableDeletedValue values must be never destructed. > > Hash table deleted values are generally are generally -1 cast to a pointer > rather than 0 cast to a pointer by convention. > > > > > if (m_impl->hasOneRef()) > > gNameCache->remove(m_impl); > > Index: WebCore/dom/QualifiedName.h > > =================================================================== > > --- WebCore/dom/QualifiedName.h (revision 57720) > > +++ WebCore/dom/QualifiedName.h (working copy) > > @@ -58,6 +58,8 @@ public: > > > > QualifiedName(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI); > > QualifiedName(const AtomicString& prefix, const char* localName, const AtomicString& namespaceURI); > > + QualifiedName(WTF::HashTableDeletedValueType) : m_impl(0) { } > > + bool isHashTableDeletedValue() const { return !m_impl; } > > ~QualifiedName() { deref(); } > > #ifdef QNAME_DEFAULT_CONSTRUCTOR > > QualifiedName() : m_impl(0) { } > > @@ -167,7 +169,7 @@ namespace WTF { > > template<> struct HashTraits<WebCore::QualifiedName> : GenericHashTraits<WebCore::QualifiedName> { > > static const bool emptyValueIsZero = false; > > static WebCore::QualifiedName emptyValue() { return WebCore::QualifiedName(WebCore::nullAtom, WebCore::nullAtom, WebCore::nullAtom); } > > - static void constructDeletedValue(WebCore::QualifiedName& slot) { new (&slot) WebCore::QualifiedName(WebCore::nullAtom, WebCore::AtomicString(HashTableDeletedValue), WebCore::nullAtom); } > > + static void constructDeletedValue(WebCore::QualifiedName& slot) { new (&slot) WebCore::QualifiedName(WTF::HashTableDeletedValue); } > > static bool isDeletedValue(const WebCore::QualifiedName& slot) { return slot.localName().isHashTableDeletedValue(); } > > }; > > } > > r- for not explaining the purpose of the patch. Please resubmit with an > explanation of what bug is being fixed (if any) and a test case of there is a > behavior change. 214153 7 53702 antonm 2010-04-19 12:12:39 -0700 Created attachment 53702 Proper is deleted check 214843 8 antonm 2010-04-20 12:17:18 -0700 (In reply to comment #7) > Created an attachment (id=53702) [details] > Proper is deleted check Friendly ping 216185 9 53702 darin 2010-04-22 17:41:45 -0700 Comment on attachment 53702 Proper is deleted check WebCore/dom/QualifiedName.h:62 + bool isHashTableDeletedValue() const { return !m_impl; } This can't be right. It should be: bool isHashTableDeletedValue() { return m_impl == hashTableDeletedValue(); } Right? 216414 10 54161 antonm 2010-04-23 08:18:41 -0700 Created attachment 54161 Proper check 216417 11 antonm 2010-04-23 08:20:56 -0700 (In reply to comment #9) > (From update of attachment 53702 [details]) > WebCore/dom/QualifiedName.h:62 > + bool isHashTableDeletedValue() const { return !m_impl; } > > This can't be right. It should be: > > bool isHashTableDeletedValue() { return m_impl == hashTableDeletedValue(); > } > > Right? Oh yes, thanks a lot for spotting this,Darin. New patch uploaded. 216433 12 54161 darin 2010-04-23 09:09:55 -0700 Comment on attachment 54161 Proper check > + ASSERT(!isHashTableDeletedValue()); // HashTableDeletedValue values must be never derefed.. There's an extra period here. Also, the comment says the same thing as the assertion, so I suggest just leaving the comment out. I'm going to say r=me, but I am wondering how you tested this change, given the old wrong version you had here before. 216440 13 54167 antonm 2010-04-23 09:26:22 -0700 Created attachment 54167 Remove comment 216444 14 antonm 2010-04-23 09:29:38 -0700 (In reply to comment #12) > (From update of attachment 54161 [details]) > > + ASSERT(!isHashTableDeletedValue()); // HashTableDeletedValue values must be never derefed.. > > There's an extra period here. Also, the comment says the same thing as the > assertion, so I suggest just leaving the comment out. > > I'm going to say r=me, but I am wondering how you tested this change, given the > old wrong version you had here before. Comment removed. I too dissatisfied with the testing I can currently do, that's why I asked if there are any unit tests in WebKit. Current patch is tested by running run-webkit-tests on MBP in both debug and release versions. Previous version of patch (one that used NULL as a marker for deleted object) got better testing as it was embedded into NodeList caching benchmark which indeed exercises removal of elements from maps keyed by QualifiedName. If you could suggest any testing method I should use, I'd be happy to run it too. 216735 15 54167 antonm 2010-04-24 10:26:06 -0700 Comment on attachment 54167 Remove comment Thanks, Darin. 216738 16 54167 commit-queue 2010-04-24 10:53:34 -0700 Comment on attachment 54167 Remove comment Clearing flags on attachment: 54167 Committed r58220: <http://trac.webkit.org/changeset/58220> 216739 17 commit-queue 2010-04-24 10:53:40 -0700 All reviewed patches have been landed. Closing bug. 53549 2010-04-16 12:15:01 -0700 2010-04-19 07:29:40 -0700 Patch bug-37722-20100416231459.patch text/plain 2957 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzczMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMTYgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB bGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxXZWJDb3JlOjpRdWFsaWZpZWROYW1lPjo6Y29u c3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAgRm9ybWVyIGltcGxlbWVudGF0aW9uIGF0dGVt cHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hUYWJsZURlbGV0ZWRWYWx1ZSkKKyAgICAgICAg aG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJlIHVzZWQgdGhhdCB3YXk6IG9uZSBjYW5ub3Qg Y29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5hbWVJbXBsIG91dCBvZiBzdWNoIEF0b21pY1N0 cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRoaXMgc3RyaW5nCisgICAgICAgIGluIHRoZSB0 YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICogZG9tL1F1YWxpZmllZE5hbWUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UXVhbGlmaWVkTmFtZTo6ZGVyZWYpOgorICAgICAgICAqIGRvbS9RdWFs aWZpZWROYW1lLmg6CisgICAgICAgIChXZWJDb3JlOjpRdWFsaWZpZWROYW1lOjpRdWFsaWZpZWRO YW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlF1YWxpZmllZE5hbWU6OmlzSGFzaFRhYmxlRGVsZXRl ZFZhbHVlKToKKyAgICAgICAgKFdURjo6KToKKwogMjAxMC0wNC0xNiAgSmlhbiBMaSAgPGppYW5s aUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRG1pdHJ5IFRpdG92LgpJbmRl eDogV2ViQ29yZS9kb20vUXVhbGlmaWVkTmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9k b20vUXVhbGlmaWVkTmFtZS5jcHAJKHJldmlzaW9uIDU3NzIwKQorKysgV2ViQ29yZS9kb20vUXVh bGlmaWVkTmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4LDYgKzc4LDcgQEAgdm9pZCBRdWFs aWZpZWROYW1lOjpkZXJlZigpCiAgICAgaWYgKCFtX2ltcGwpCiAgICAgICAgIHJldHVybjsKICNl bmRpZgorICAgIEFTU0VSVChtX2ltcGwpOyAvLyBIYXNoVGFibGVEZWxldGVkVmFsdWUgdmFsdWVz IG11c3QgYmUgbmV2ZXIgZGVzdHJ1Y3RlZC4KIAogICAgIGlmIChtX2ltcGwtPmhhc09uZVJlZigp KQogICAgICAgICBnTmFtZUNhY2hlLT5yZW1vdmUobV9pbXBsKTsKSW5kZXg6IFdlYkNvcmUvZG9t L1F1YWxpZmllZE5hbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1l LmgJKHJldmlzaW9uIDU3NzIwKQorKysgV2ViQ29yZS9kb20vUXVhbGlmaWVkTmFtZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01OCw2ICs1OCw4IEBAIHB1YmxpYzoKIAogICAgIFF1YWxpZmllZE5hbWUo Y29uc3QgQXRvbWljU3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgbG9jYWxOYW1l LCBjb25zdCBBdG9taWNTdHJpbmcmIG5hbWVzcGFjZVVSSSk7CiAgICAgUXVhbGlmaWVkTmFtZShj b25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCwgY29uc3QgY2hhciogbG9jYWxOYW1lLCBjb25zdCBB dG9taWNTdHJpbmcmIG5hbWVzcGFjZVVSSSk7CisgICAgUXVhbGlmaWVkTmFtZShXVEY6Okhhc2hU YWJsZURlbGV0ZWRWYWx1ZVR5cGUpIDogbV9pbXBsKDApIHsgfQorICAgIGJvb2wgaXNIYXNoVGFi bGVEZWxldGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiAhbV9pbXBsOyB9CiAgICAgflF1YWxpZmll ZE5hbWUoKSB7IGRlcmVmKCk7IH0KICNpZmRlZiBRTkFNRV9ERUZBVUxUX0NPTlNUUlVDVE9SCiAg ICAgUXVhbGlmaWVkTmFtZSgpIDogbV9pbXBsKDApIHsgfQpAQCAtMTY3LDcgKzE2OSw3IEBAIG5h bWVzcGFjZSBXVEYgewogICAgIHRlbXBsYXRlPD4gc3RydWN0IEhhc2hUcmFpdHM8V2ViQ29yZTo6 UXVhbGlmaWVkTmFtZT4gOiBHZW5lcmljSGFzaFRyYWl0czxXZWJDb3JlOjpRdWFsaWZpZWROYW1l PiB7CiAgICAgICAgIHN0YXRpYyBjb25zdCBib29sIGVtcHR5VmFsdWVJc1plcm8gPSBmYWxzZTsK ICAgICAgICAgc3RhdGljIFdlYkNvcmU6OlF1YWxpZmllZE5hbWUgZW1wdHlWYWx1ZSgpIHsgcmV0 dXJuIFdlYkNvcmU6OlF1YWxpZmllZE5hbWUoV2ViQ29yZTo6bnVsbEF0b20sIFdlYkNvcmU6Om51 bGxBdG9tLCBXZWJDb3JlOjpudWxsQXRvbSk7IH0KLSAgICAgICAgc3RhdGljIHZvaWQgY29uc3Ry dWN0RGVsZXRlZFZhbHVlKFdlYkNvcmU6OlF1YWxpZmllZE5hbWUmIHNsb3QpIHsgbmV3ICgmc2xv dCkgV2ViQ29yZTo6UXVhbGlmaWVkTmFtZShXZWJDb3JlOjpudWxsQXRvbSwgV2ViQ29yZTo6QXRv bWljU3RyaW5nKEhhc2hUYWJsZURlbGV0ZWRWYWx1ZSksIFdlYkNvcmU6Om51bGxBdG9tKTsgfQor ICAgICAgICBzdGF0aWMgdm9pZCBjb25zdHJ1Y3REZWxldGVkVmFsdWUoV2ViQ29yZTo6UXVhbGlm aWVkTmFtZSYgc2xvdCkgeyBuZXcgKCZzbG90KSBXZWJDb3JlOjpRdWFsaWZpZWROYW1lKFdURjo6 SGFzaFRhYmxlRGVsZXRlZFZhbHVlKTsgfQogICAgICAgICBzdGF0aWMgYm9vbCBpc0RlbGV0ZWRW YWx1ZShjb25zdCBXZWJDb3JlOjpRdWFsaWZpZWROYW1lJiBzbG90KSB7IHJldHVybiBzbG90Lmxv Y2FsTmFtZSgpLmlzSGFzaFRhYmxlRGVsZXRlZFZhbHVlKCk7IH0KICAgICB9OwogfQo= 53677 2010-04-19 07:29:46 -0700 2010-04-19 12:12:32 -0700 Patch bug-37722-20100419182944.patch text/plain 4809 antonm SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3ODA5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMTkgIEFudG9uIE11 aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxXZWJDb3Jl OjpRdWFsaWZpZWROYW1lPjo6Y29uc3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAgRm9ybWVy IGltcGxlbWVudGF0aW9uIGF0dGVtcHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hUYWJsZURl bGV0ZWRWYWx1ZSkKKyAgICAgICAgaG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJlIHVzZWQg dGhhdCB3YXk6IG9uZSBjYW5ub3QgY29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5hbWVJbXBs IG91dCBvZiBzdWNoIEF0b21pY1N0cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRoaXMgc3Ry aW5nCisgICAgICAgIGluIHRoZSB0YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICogd3RmL1Jl ZlB0ci5oOiBleHBvc2UgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlCisKIDIwMTAtMDQtMTggIEt3 YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBi eSBMYXN6bG8gR29tYm9zLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL1JlZlB0ci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9SZWZQdHIuaAkocmV2aXNpb24gNTc4MDgpCisr KyBKYXZhU2NyaXB0Q29yZS93dGYvUmVmUHRyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDkgKzc5 LDkgQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICAgICAgdm9pZCBzd2FwKFJlZlB0ciYpOwogCi0g ICAgcHJpdmF0ZToKICAgICAgICAgc3RhdGljIFQqIGhhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpIHsg cmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VCo+KC0xKTsgfQogCisgICAgcHJpdmF0ZToKICAgICAg ICAgVCogbV9wdHI7CiAgICAgfTsKICAgICAKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzgwOSkKKysrIFdlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMTkgIEFu dG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxX ZWJDb3JlOjpRdWFsaWZpZWROYW1lPjo6Y29uc3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAg Rm9ybWVyIGltcGxlbWVudGF0aW9uIGF0dGVtcHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hU YWJsZURlbGV0ZWRWYWx1ZSkKKyAgICAgICAgaG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJl IHVzZWQgdGhhdCB3YXk6IG9uZSBjYW5ub3QgY29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5h bWVJbXBsIG91dCBvZiBzdWNoIEF0b21pY1N0cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRo aXMgc3RyaW5nCisgICAgICAgIGluIHRoZSB0YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICog ZG9tL1F1YWxpZmllZE5hbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVhbGlmaWVkTmFtZTo6 ZGVyZWYpOiBjaGVjayB0aGF0IGhhc2ggdGFibGUgZGVsZXRlZCB2YWx1ZXMgbmV2ZXIgZGVyZWZl ZAorICAgICAgICAqIGRvbS9RdWFsaWZpZWROYW1lLmg6CisgICAgICAgIChXZWJDb3JlOjpRdWFs aWZpZWROYW1lOjpRdWFsaWZpZWROYW1lKTogYWRkIGEgY29uc3RydWN0b3IgdG8gY3JlYXRlIGhh c2ggdGFibGUgZGVsZXRlZCB2YWx1ZXMKKyAgICAgICAgKFdlYkNvcmU6OlF1YWxpZmllZE5hbWU6 OmlzSGFzaFRhYmxlRGVsZXRlZFZhbHVlKTogYWRkIGEgY2hlY2sgaWYgZ2l2ZW4gaW5zdGFuY2Ug aXMgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlCisgICAgICAgIChXVEY6Oik6CisKIDIwMTAtMDQt MTkgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuY3BwCShyZXZpc2lvbiA1Nzgw OCkKKysrIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 OCw2ICs3OCw3IEBAIHZvaWQgUXVhbGlmaWVkTmFtZTo6ZGVyZWYoKQogICAgIGlmICghbV9pbXBs KQogICAgICAgICByZXR1cm47CiAjZW5kaWYKKyAgICBBU1NFUlQobV9pbXBsICE9IGhhc2hUYWJs ZURlbGV0ZWRWYWx1ZSgpKTsgLy8gSGFzaFRhYmxlRGVsZXRlZFZhbHVlIHZhbHVlcyBtdXN0IGJl IG5ldmVyIGRlcmVmZWQuLgogCiAgICAgaWYgKG1faW1wbC0+aGFzT25lUmVmKCkpCiAgICAgICAg IGdOYW1lQ2FjaGUtPnJlbW92ZShtX2ltcGwpOwpJbmRleDogV2ViQ29yZS9kb20vUXVhbGlmaWVk TmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuaAkocmV2aXNp b24gNTc4MDgpCisrKyBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmgJKHdvcmtpbmcgY29weSkK QEAgLTU4LDYgKzU4LDggQEAgcHVibGljOgogCiAgICAgUXVhbGlmaWVkTmFtZShjb25zdCBBdG9t aWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUsIGNvbnN0IEF0 b21pY1N0cmluZyYgbmFtZXNwYWNlVVJJKTsKICAgICBRdWFsaWZpZWROYW1lKGNvbnN0IEF0b21p Y1N0cmluZyYgcHJlZml4LCBjb25zdCBjaGFyKiBsb2NhbE5hbWUsIGNvbnN0IEF0b21pY1N0cmlu ZyYgbmFtZXNwYWNlVVJJKTsKKyAgICBRdWFsaWZpZWROYW1lKFdURjo6SGFzaFRhYmxlRGVsZXRl ZFZhbHVlVHlwZSkgOiBtX2ltcGwoaGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkpIHsgfQorICAgIGJv b2wgaXNIYXNoVGFibGVEZWxldGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiAhbV9pbXBsOyB9CiAg ICAgflF1YWxpZmllZE5hbWUoKSB7IGRlcmVmKCk7IH0KICNpZmRlZiBRTkFNRV9ERUZBVUxUX0NP TlNUUlVDVE9SCiAgICAgUXVhbGlmaWVkTmFtZSgpIDogbV9pbXBsKDApIHsgfQpAQCAtOTIsNiAr OTQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5pdChjb25zdCBBdG9taWNTdHJpbmcmIHByZWZp eCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYgbmFt ZXNwYWNlVVJJKTsKICAgICB2b2lkIHJlZigpIGNvbnN0IHsgbV9pbXBsLT5yZWYoKTsgfQogICAg IHZvaWQgZGVyZWYoKTsKKworICAgIHN0YXRpYyBRdWFsaWZpZWROYW1lSW1wbCogaGFzaFRhYmxl RGVsZXRlZFZhbHVlKCkgeyByZXR1cm4gUmVmUHRyPFF1YWxpZmllZE5hbWVJbXBsPjo6aGFzaFRh YmxlRGVsZXRlZFZhbHVlKCk7IH0KICAgICAKICAgICBRdWFsaWZpZWROYW1lSW1wbCogbV9pbXBs OwogfTsKQEAgLTE2Nyw3ICsxNzEsNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICB0ZW1wbGF0ZTw+ IHN0cnVjdCBIYXNoVHJhaXRzPFdlYkNvcmU6OlF1YWxpZmllZE5hbWU+IDogR2VuZXJpY0hhc2hU cmFpdHM8V2ViQ29yZTo6UXVhbGlmaWVkTmFtZT4gewogICAgICAgICBzdGF0aWMgY29uc3QgYm9v bCBlbXB0eVZhbHVlSXNaZXJvID0gZmFsc2U7CiAgICAgICAgIHN0YXRpYyBXZWJDb3JlOjpRdWFs aWZpZWROYW1lIGVtcHR5VmFsdWUoKSB7IHJldHVybiBXZWJDb3JlOjpRdWFsaWZpZWROYW1lKFdl YkNvcmU6Om51bGxBdG9tLCBXZWJDb3JlOjpudWxsQXRvbSwgV2ViQ29yZTo6bnVsbEF0b20pOyB9 Ci0gICAgICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShXZWJDb3JlOjpRdWFs aWZpZWROYW1lJiBzbG90KSB7IG5ldyAoJnNsb3QpIFdlYkNvcmU6OlF1YWxpZmllZE5hbWUoV2Vi Q29yZTo6bnVsbEF0b20sIFdlYkNvcmU6OkF0b21pY1N0cmluZyhIYXNoVGFibGVEZWxldGVkVmFs dWUpLCBXZWJDb3JlOjpudWxsQXRvbSk7IH0KKyAgICAgICAgc3RhdGljIHZvaWQgY29uc3RydWN0 RGVsZXRlZFZhbHVlKFdlYkNvcmU6OlF1YWxpZmllZE5hbWUmIHNsb3QpIHsgbmV3ICgmc2xvdCkg V2ViQ29yZTo6UXVhbGlmaWVkTmFtZShXVEY6Okhhc2hUYWJsZURlbGV0ZWRWYWx1ZSk7IH0KICAg ICAgICAgc3RhdGljIGJvb2wgaXNEZWxldGVkVmFsdWUoY29uc3QgV2ViQ29yZTo6UXVhbGlmaWVk TmFtZSYgc2xvdCkgeyByZXR1cm4gc2xvdC5sb2NhbE5hbWUoKS5pc0hhc2hUYWJsZURlbGV0ZWRW YWx1ZSgpOyB9CiAgICAgfTsKIH0K 53702 2010-04-19 12:12:39 -0700 2010-04-23 08:18:34 -0700 Proper is deleted check bug-37722-20100419231237.patch text/plain 4926 antonm SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3ODA5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMTkgIEFudG9uIE11 aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxXZWJDb3Jl OjpRdWFsaWZpZWROYW1lPjo6Y29uc3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAgRm9ybWVy IGltcGxlbWVudGF0aW9uIGF0dGVtcHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hUYWJsZURl bGV0ZWRWYWx1ZSkKKyAgICAgICAgaG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJlIHVzZWQg dGhhdCB3YXk6IG9uZSBjYW5ub3QgY29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5hbWVJbXBs IG91dCBvZiBzdWNoIEF0b21pY1N0cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRoaXMgc3Ry aW5nCisgICAgICAgIGluIHRoZSB0YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICogd3RmL1Jl ZlB0ci5oOiBleHBvc2UgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlCisKIDIwMTAtMDQtMTggIEt3 YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBi eSBMYXN6bG8gR29tYm9zLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL1JlZlB0ci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9SZWZQdHIuaAkocmV2aXNpb24gNTc4MDgpCisr KyBKYXZhU2NyaXB0Q29yZS93dGYvUmVmUHRyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDkgKzc5 LDkgQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICAgICAgdm9pZCBzd2FwKFJlZlB0ciYpOwogCi0g ICAgcHJpdmF0ZToKICAgICAgICAgc3RhdGljIFQqIGhhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpIHsg cmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VCo+KC0xKTsgfQogCisgICAgcHJpdmF0ZToKICAgICAg ICAgVCogbV9wdHI7CiAgICAgfTsKICAgICAKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzgwOSkKKysrIFdlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMTkgIEFu dG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxX ZWJDb3JlOjpRdWFsaWZpZWROYW1lPjo6Y29uc3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAg Rm9ybWVyIGltcGxlbWVudGF0aW9uIGF0dGVtcHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hU YWJsZURlbGV0ZWRWYWx1ZSkKKyAgICAgICAgaG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJl IHVzZWQgdGhhdCB3YXk6IG9uZSBjYW5ub3QgY29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5h bWVJbXBsIG91dCBvZiBzdWNoIEF0b21pY1N0cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRo aXMgc3RyaW5nCisgICAgICAgIGluIHRoZSB0YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICog ZG9tL1F1YWxpZmllZE5hbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVhbGlmaWVkTmFtZTo6 ZGVyZWYpOiBjaGVjayB0aGF0IGhhc2ggdGFibGUgZGVsZXRlZCB2YWx1ZXMgbmV2ZXIgZGVyZWZl ZAorICAgICAgICAqIGRvbS9RdWFsaWZpZWROYW1lLmg6CisgICAgICAgIChXZWJDb3JlOjpRdWFs aWZpZWROYW1lOjpRdWFsaWZpZWROYW1lKTogYWRkIGEgY29uc3RydWN0b3IgdG8gY3JlYXRlIGhh c2ggdGFibGUgZGVsZXRlZCB2YWx1ZXMKKyAgICAgICAgKFdlYkNvcmU6OlF1YWxpZmllZE5hbWU6 OmlzSGFzaFRhYmxlRGVsZXRlZFZhbHVlKTogYWRkIGEgY2hlY2sgaWYgZ2l2ZW4gaW5zdGFuY2Ug aXMgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlCisgICAgICAgIChXVEY6Oik6CisKIDIwMTAtMDQt MTkgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuY3BwCShyZXZpc2lvbiA1Nzgw OCkKKysrIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 OCw2ICs3OCw3IEBAIHZvaWQgUXVhbGlmaWVkTmFtZTo6ZGVyZWYoKQogICAgIGlmICghbV9pbXBs KQogICAgICAgICByZXR1cm47CiAjZW5kaWYKKyAgICBBU1NFUlQobV9pbXBsICE9IGhhc2hUYWJs ZURlbGV0ZWRWYWx1ZSgpKTsgLy8gSGFzaFRhYmxlRGVsZXRlZFZhbHVlIHZhbHVlcyBtdXN0IGJl IG5ldmVyIGRlcmVmZWQuLgogCiAgICAgaWYgKG1faW1wbC0+aGFzT25lUmVmKCkpCiAgICAgICAg IGdOYW1lQ2FjaGUtPnJlbW92ZShtX2ltcGwpOwpJbmRleDogV2ViQ29yZS9kb20vUXVhbGlmaWVk TmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuaAkocmV2aXNp b24gNTc4MDgpCisrKyBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmgJKHdvcmtpbmcgY29weSkK QEAgLTU4LDYgKzU4LDggQEAgcHVibGljOgogCiAgICAgUXVhbGlmaWVkTmFtZShjb25zdCBBdG9t aWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUsIGNvbnN0IEF0 b21pY1N0cmluZyYgbmFtZXNwYWNlVVJJKTsKICAgICBRdWFsaWZpZWROYW1lKGNvbnN0IEF0b21p Y1N0cmluZyYgcHJlZml4LCBjb25zdCBjaGFyKiBsb2NhbE5hbWUsIGNvbnN0IEF0b21pY1N0cmlu ZyYgbmFtZXNwYWNlVVJJKTsKKyAgICBRdWFsaWZpZWROYW1lKFdURjo6SGFzaFRhYmxlRGVsZXRl ZFZhbHVlVHlwZSkgOiBtX2ltcGwoaGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkpIHsgfQorICAgIGJv b2wgaXNIYXNoVGFibGVEZWxldGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiAhbV9pbXBsOyB9CiAg ICAgflF1YWxpZmllZE5hbWUoKSB7IGRlcmVmKCk7IH0KICNpZmRlZiBRTkFNRV9ERUZBVUxUX0NP TlNUUlVDVE9SCiAgICAgUXVhbGlmaWVkTmFtZSgpIDogbV9pbXBsKDApIHsgfQpAQCAtOTIsNiAr OTQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5pdChjb25zdCBBdG9taWNTdHJpbmcmIHByZWZp eCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYgbmFt ZXNwYWNlVVJJKTsKICAgICB2b2lkIHJlZigpIGNvbnN0IHsgbV9pbXBsLT5yZWYoKTsgfQogICAg IHZvaWQgZGVyZWYoKTsKKworICAgIHN0YXRpYyBRdWFsaWZpZWROYW1lSW1wbCogaGFzaFRhYmxl RGVsZXRlZFZhbHVlKCkgeyByZXR1cm4gUmVmUHRyPFF1YWxpZmllZE5hbWVJbXBsPjo6aGFzaFRh YmxlRGVsZXRlZFZhbHVlKCk7IH0KICAgICAKICAgICBRdWFsaWZpZWROYW1lSW1wbCogbV9pbXBs OwogfTsKQEAgLTE2Nyw4ICsxNzEsOCBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICB0ZW1wbGF0ZTw+ IHN0cnVjdCBIYXNoVHJhaXRzPFdlYkNvcmU6OlF1YWxpZmllZE5hbWU+IDogR2VuZXJpY0hhc2hU cmFpdHM8V2ViQ29yZTo6UXVhbGlmaWVkTmFtZT4gewogICAgICAgICBzdGF0aWMgY29uc3QgYm9v bCBlbXB0eVZhbHVlSXNaZXJvID0gZmFsc2U7CiAgICAgICAgIHN0YXRpYyBXZWJDb3JlOjpRdWFs aWZpZWROYW1lIGVtcHR5VmFsdWUoKSB7IHJldHVybiBXZWJDb3JlOjpRdWFsaWZpZWROYW1lKFdl YkNvcmU6Om51bGxBdG9tLCBXZWJDb3JlOjpudWxsQXRvbSwgV2ViQ29yZTo6bnVsbEF0b20pOyB9 Ci0gICAgICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShXZWJDb3JlOjpRdWFs aWZpZWROYW1lJiBzbG90KSB7IG5ldyAoJnNsb3QpIFdlYkNvcmU6OlF1YWxpZmllZE5hbWUoV2Vi Q29yZTo6bnVsbEF0b20sIFdlYkNvcmU6OkF0b21pY1N0cmluZyhIYXNoVGFibGVEZWxldGVkVmFs dWUpLCBXZWJDb3JlOjpudWxsQXRvbSk7IH0KLSAgICAgICAgc3RhdGljIGJvb2wgaXNEZWxldGVk VmFsdWUoY29uc3QgV2ViQ29yZTo6UXVhbGlmaWVkTmFtZSYgc2xvdCkgeyByZXR1cm4gc2xvdC5s b2NhbE5hbWUoKS5pc0hhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpOyB9CisgICAgICAgIHN0YXRpYyB2 b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShXZWJDb3JlOjpRdWFsaWZpZWROYW1lJiBzbG90KSB7 IG5ldyAoJnNsb3QpIFdlYkNvcmU6OlF1YWxpZmllZE5hbWUoV1RGOjpIYXNoVGFibGVEZWxldGVk VmFsdWUpOyB9CisgICAgICAgIHN0YXRpYyBib29sIGlzRGVsZXRlZFZhbHVlKGNvbnN0IFdlYkNv cmU6OlF1YWxpZmllZE5hbWUmIHNsb3QpIHsgcmV0dXJuIHNsb3QuaXNIYXNoVGFibGVEZWxldGVk VmFsdWUoKTsgfQogICAgIH07CiB9CiAK 54161 2010-04-23 08:18:41 -0700 2010-04-23 09:26:15 -0700 Proper check bug-37722-20100423191839.patch text/plain 4949 antonm SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU4MTYzKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMTkgIEFudG9uIE11 aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxXZWJDb3Jl OjpRdWFsaWZpZWROYW1lPjo6Y29uc3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAgRm9ybWVy IGltcGxlbWVudGF0aW9uIGF0dGVtcHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hUYWJsZURl bGV0ZWRWYWx1ZSkKKyAgICAgICAgaG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJlIHVzZWQg dGhhdCB3YXk6IG9uZSBjYW5ub3QgY29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5hbWVJbXBs IG91dCBvZiBzdWNoIEF0b21pY1N0cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRoaXMgc3Ry aW5nCisgICAgICAgIGluIHRoZSB0YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICogd3RmL1Jl ZlB0ci5oOiBleHBvc2UgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlCisKIDIwMTAtMDQtMjIgIFN0 ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvUmVmUHRyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL1JlZlB0ci5oCShyZXZpc2lvbiA1ODE2MykKKysrIEph dmFTY3JpcHRDb3JlL3d0Zi9SZWZQdHIuaAkod29ya2luZyBjb3B5KQpAQCAtNzksOSArNzksOSBA QCBuYW1lc3BhY2UgV1RGIHsKIAogICAgICAgICB2b2lkIHN3YXAoUmVmUHRyJik7CiAKLSAgICBw cml2YXRlOgogICAgICAgICBzdGF0aWMgVCogaGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkgeyByZXR1 cm4gcmVpbnRlcnByZXRfY2FzdDxUKj4oLTEpOyB9CiAKKyAgICBwcml2YXRlOgogICAgICAgICBU KiBtX3B0cjsKICAgICB9OwogICAgIApJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU4MTYzKQorKysgV2ViQ29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNC0xOSAgQW50b24g TXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IHRvIGNvbnN0cnVjdCBIYXNoVHJhaXRzPFdlYkNv cmU6OlF1YWxpZmllZE5hbWU+Ojpjb25zdHJ1Y3REZWxldGVkVmFsdWUKKworICAgICAgICBGb3Jt ZXIgaW1wbGVtZW50YXRpb24gYXR0ZW1wdGVkIHRvIHVzZSBBdG9taWNTdHJpbmcoSGFzaFRhYmxl RGVsZXRlZFZhbHVlKQorICAgICAgICBob3dldmVyIHRob3NlIHZhbHVlcyBjYW5ub3QgYmUgdXNl ZCB0aGF0IHdheTogb25lIGNhbm5vdCBjb25zdHJ1Y3QKKyAgICAgICAgUXVhbGlmaWVkTmFtZUlt cGwgb3V0IG9mIHN1Y2ggQXRvbWljU3RyaW5nIGFzIHdlJ2xsIHRyeSB0byBsb29rdXAgdGhpcyBz dHJpbmcKKyAgICAgICAgaW4gdGhlIHRhYmxlLCBmb3IgZXhhbXBsZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzIyCisKKyAgICAgICAgKiBkb20v UXVhbGlmaWVkTmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpRdWFsaWZpZWROYW1lOjpkZXJl Zik6IGNoZWNrIHRoYXQgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlcyBuZXZlciBkZXJlZmVkCisg ICAgICAgICogZG9tL1F1YWxpZmllZE5hbWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlF1YWxpZmll ZE5hbWU6OlF1YWxpZmllZE5hbWUpOiBhZGQgYSBjb25zdHJ1Y3RvciB0byBjcmVhdGUgaGFzaCB0 YWJsZSBkZWxldGVkIHZhbHVlcworICAgICAgICAoV2ViQ29yZTo6UXVhbGlmaWVkTmFtZTo6aXNI YXNoVGFibGVEZWxldGVkVmFsdWUpOiBhZGQgYSBjaGVjayBpZiBnaXZlbiBpbnN0YW5jZSBpcyBo YXNoIHRhYmxlIGRlbGV0ZWQgdmFsdWUKKyAgICAgICAgKFdURjo6KToKKwogMjAxMC0wNC0yMyAg QWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmNwcAkocmV2aXNpb24g NTgxNjMpCisrKyBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzgsNiArNzgsNyBAQCB2b2lkIFF1YWxpZmllZE5hbWU6OmRlcmVmKCkKICAgICBpZiAoIW1f aW1wbCkKICAgICAgICAgcmV0dXJuOwogI2VuZGlmCisgICAgQVNTRVJUKCFpc0hhc2hUYWJsZURl bGV0ZWRWYWx1ZSgpKTsgLy8gSGFzaFRhYmxlRGVsZXRlZFZhbHVlIHZhbHVlcyBtdXN0IGJlIG5l dmVyIGRlcmVmZWQuLgogCiAgICAgaWYgKG1faW1wbC0+aGFzT25lUmVmKCkpCiAgICAgICAgIGdO YW1lQ2FjaGUtPnJlbW92ZShtX2ltcGwpOwpJbmRleDogV2ViQ29yZS9kb20vUXVhbGlmaWVkTmFt ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1F1YWxpZmllZE5hbWUuaAkocmV2aXNpb24g NTgxNjMpCisrKyBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmgJKHdvcmtpbmcgY29weSkKQEAg LTU4LDYgKzU4LDggQEAgcHVibGljOgogCiAgICAgUXVhbGlmaWVkTmFtZShjb25zdCBBdG9taWNT dHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUsIGNvbnN0IEF0b21p Y1N0cmluZyYgbmFtZXNwYWNlVVJJKTsKICAgICBRdWFsaWZpZWROYW1lKGNvbnN0IEF0b21pY1N0 cmluZyYgcHJlZml4LCBjb25zdCBjaGFyKiBsb2NhbE5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYg bmFtZXNwYWNlVVJJKTsKKyAgICBRdWFsaWZpZWROYW1lKFdURjo6SGFzaFRhYmxlRGVsZXRlZFZh bHVlVHlwZSkgOiBtX2ltcGwoaGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkpIHsgfQorICAgIGJvb2wg aXNIYXNoVGFibGVEZWxldGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX2ltcGwgPT0gaGFzaFRh YmxlRGVsZXRlZFZhbHVlKCk7IH0KICAgICB+UXVhbGlmaWVkTmFtZSgpIHsgZGVyZWYoKTsgfQog I2lmZGVmIFFOQU1FX0RFRkFVTFRfQ09OU1RSVUNUT1IKICAgICBRdWFsaWZpZWROYW1lKCkgOiBt X2ltcGwoMCkgeyB9CkBAIC05Miw2ICs5NCw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbml0KGNv bnN0IEF0b21pY1N0cmluZyYgcHJlZml4LCBjb25zdCBBdG9taWNTdHJpbmcmIGxvY2FsTmFtZSwg Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lc3BhY2VVUkkpOwogICAgIHZvaWQgcmVmKCkgY29uc3Qg eyBtX2ltcGwtPnJlZigpOyB9CiAgICAgdm9pZCBkZXJlZigpOworCisgICAgc3RhdGljIFF1YWxp ZmllZE5hbWVJbXBsKiBoYXNoVGFibGVEZWxldGVkVmFsdWUoKSB7IHJldHVybiBSZWZQdHI8UXVh bGlmaWVkTmFtZUltcGw+OjpoYXNoVGFibGVEZWxldGVkVmFsdWUoKTsgfQogICAgIAogICAgIFF1 YWxpZmllZE5hbWVJbXBsKiBtX2ltcGw7CiB9OwpAQCAtMTY3LDggKzE3MSw4IEBAIG5hbWVzcGFj ZSBXVEYgewogICAgIHRlbXBsYXRlPD4gc3RydWN0IEhhc2hUcmFpdHM8V2ViQ29yZTo6UXVhbGlm aWVkTmFtZT4gOiBHZW5lcmljSGFzaFRyYWl0czxXZWJDb3JlOjpRdWFsaWZpZWROYW1lPiB7CiAg ICAgICAgIHN0YXRpYyBjb25zdCBib29sIGVtcHR5VmFsdWVJc1plcm8gPSBmYWxzZTsKICAgICAg ICAgc3RhdGljIFdlYkNvcmU6OlF1YWxpZmllZE5hbWUgZW1wdHlWYWx1ZSgpIHsgcmV0dXJuIFdl YkNvcmU6OlF1YWxpZmllZE5hbWUoV2ViQ29yZTo6bnVsbEF0b20sIFdlYkNvcmU6Om51bGxBdG9t LCBXZWJDb3JlOjpudWxsQXRvbSk7IH0KLSAgICAgICAgc3RhdGljIHZvaWQgY29uc3RydWN0RGVs ZXRlZFZhbHVlKFdlYkNvcmU6OlF1YWxpZmllZE5hbWUmIHNsb3QpIHsgbmV3ICgmc2xvdCkgV2Vi Q29yZTo6UXVhbGlmaWVkTmFtZShXZWJDb3JlOjpudWxsQXRvbSwgV2ViQ29yZTo6QXRvbWljU3Ry aW5nKEhhc2hUYWJsZURlbGV0ZWRWYWx1ZSksIFdlYkNvcmU6Om51bGxBdG9tKTsgfQotICAgICAg ICBzdGF0aWMgYm9vbCBpc0RlbGV0ZWRWYWx1ZShjb25zdCBXZWJDb3JlOjpRdWFsaWZpZWROYW1l JiBzbG90KSB7IHJldHVybiBzbG90LmxvY2FsTmFtZSgpLmlzSGFzaFRhYmxlRGVsZXRlZFZhbHVl KCk7IH0KKyAgICAgICAgc3RhdGljIHZvaWQgY29uc3RydWN0RGVsZXRlZFZhbHVlKFdlYkNvcmU6 OlF1YWxpZmllZE5hbWUmIHNsb3QpIHsgbmV3ICgmc2xvdCkgV2ViQ29yZTo6UXVhbGlmaWVkTmFt ZShXVEY6Okhhc2hUYWJsZURlbGV0ZWRWYWx1ZSk7IH0KKyAgICAgICAgc3RhdGljIGJvb2wgaXNE ZWxldGVkVmFsdWUoY29uc3QgV2ViQ29yZTo6UXVhbGlmaWVkTmFtZSYgc2xvdCkgeyByZXR1cm4g c2xvdC5pc0hhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpOyB9CiAgICAgfTsKIH0KIAo= 54167 2010-04-23 09:26:22 -0700 2010-04-24 10:53:34 -0700 Remove comment bug-37722-20100423202620.patch text/plain 4893 antonm SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU4MTYzKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMTkgIEFudG9uIE11 aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0byBjb25zdHJ1Y3QgSGFzaFRyYWl0czxXZWJDb3Jl OjpRdWFsaWZpZWROYW1lPjo6Y29uc3RydWN0RGVsZXRlZFZhbHVlCisKKyAgICAgICAgRm9ybWVy IGltcGxlbWVudGF0aW9uIGF0dGVtcHRlZCB0byB1c2UgQXRvbWljU3RyaW5nKEhhc2hUYWJsZURl bGV0ZWRWYWx1ZSkKKyAgICAgICAgaG93ZXZlciB0aG9zZSB2YWx1ZXMgY2Fubm90IGJlIHVzZWQg dGhhdCB3YXk6IG9uZSBjYW5ub3QgY29uc3RydWN0CisgICAgICAgIFF1YWxpZmllZE5hbWVJbXBs IG91dCBvZiBzdWNoIEF0b21pY1N0cmluZyBhcyB3ZSdsbCB0cnkgdG8gbG9va3VwIHRoaXMgc3Ry aW5nCisgICAgICAgIGluIHRoZSB0YWJsZSwgZm9yIGV4YW1wbGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzcyMgorCisgICAgICAgICogd3RmL1Jl ZlB0ci5oOiBleHBvc2UgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlCisKIDIwMTAtMDQtMjIgIFN0 ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvUmVmUHRyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL1JlZlB0ci5oCShyZXZpc2lvbiA1ODE2MykKKysrIEph dmFTY3JpcHRDb3JlL3d0Zi9SZWZQdHIuaAkod29ya2luZyBjb3B5KQpAQCAtNzksOSArNzksOSBA QCBuYW1lc3BhY2UgV1RGIHsKIAogICAgICAgICB2b2lkIHN3YXAoUmVmUHRyJik7CiAKLSAgICBw cml2YXRlOgogICAgICAgICBzdGF0aWMgVCogaGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkgeyByZXR1 cm4gcmVpbnRlcnByZXRfY2FzdDxUKj4oLTEpOyB9CiAKKyAgICBwcml2YXRlOgogICAgICAgICBU KiBtX3B0cjsKICAgICB9OwogICAgIApJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU4MTYzKQorKysgV2ViQ29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNC0xOSAgQW50b24g TXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IHRvIGNvbnN0cnVjdCBIYXNoVHJhaXRzPFdlYkNv cmU6OlF1YWxpZmllZE5hbWU+Ojpjb25zdHJ1Y3REZWxldGVkVmFsdWUKKworICAgICAgICBGb3Jt ZXIgaW1wbGVtZW50YXRpb24gYXR0ZW1wdGVkIHRvIHVzZSBBdG9taWNTdHJpbmcoSGFzaFRhYmxl RGVsZXRlZFZhbHVlKQorICAgICAgICBob3dldmVyIHRob3NlIHZhbHVlcyBjYW5ub3QgYmUgdXNl ZCB0aGF0IHdheTogb25lIGNhbm5vdCBjb25zdHJ1Y3QKKyAgICAgICAgUXVhbGlmaWVkTmFtZUlt cGwgb3V0IG9mIHN1Y2ggQXRvbWljU3RyaW5nIGFzIHdlJ2xsIHRyeSB0byBsb29rdXAgdGhpcyBz dHJpbmcKKyAgICAgICAgaW4gdGhlIHRhYmxlLCBmb3IgZXhhbXBsZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzIyCisKKyAgICAgICAgKiBkb20v UXVhbGlmaWVkTmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpRdWFsaWZpZWROYW1lOjpkZXJl Zik6IGNoZWNrIHRoYXQgaGFzaCB0YWJsZSBkZWxldGVkIHZhbHVlcyBuZXZlciBkZXJlZmVkCisg ICAgICAgICogZG9tL1F1YWxpZmllZE5hbWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlF1YWxpZmll ZE5hbWU6OlF1YWxpZmllZE5hbWUpOiBhZGQgYSBjb25zdHJ1Y3RvciB0byBjcmVhdGUgaGFzaCB0 YWJsZSBkZWxldGVkIHZhbHVlcworICAgICAgICAoV2ViQ29yZTo6UXVhbGlmaWVkTmFtZTo6aXNI YXNoVGFibGVEZWxldGVkVmFsdWUpOiBhZGQgYSBjaGVjayBpZiBnaXZlbiBpbnN0YW5jZSBpcyBo YXNoIHRhYmxlIGRlbGV0ZWQgdmFsdWUKKyAgICAgICAgKFdURjo6KToKKwogMjAxMC0wNC0yMyAg QWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmNwcAkocmV2aXNpb24g NTgxNjMpCisrKyBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzgsNiArNzgsNyBAQCB2b2lkIFF1YWxpZmllZE5hbWU6OmRlcmVmKCkKICAgICBpZiAoIW1f aW1wbCkKICAgICAgICAgcmV0dXJuOwogI2VuZGlmCisgICAgQVNTRVJUKCFpc0hhc2hUYWJsZURl bGV0ZWRWYWx1ZSgpKTsKIAogICAgIGlmIChtX2ltcGwtPmhhc09uZVJlZigpKQogICAgICAgICBn TmFtZUNhY2hlLT5yZW1vdmUobV9pbXBsKTsKSW5kZXg6IFdlYkNvcmUvZG9tL1F1YWxpZmllZE5h bWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9RdWFsaWZpZWROYW1lLmgJKHJldmlzaW9u IDU4MTYzKQorKysgV2ViQ29yZS9kb20vUXVhbGlmaWVkTmFtZS5oCSh3b3JraW5nIGNvcHkpCkBA IC01OCw2ICs1OCw4IEBAIHB1YmxpYzoKIAogICAgIFF1YWxpZmllZE5hbWUoY29uc3QgQXRvbWlj U3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgbG9jYWxOYW1lLCBjb25zdCBBdG9t aWNTdHJpbmcmIG5hbWVzcGFjZVVSSSk7CiAgICAgUXVhbGlmaWVkTmFtZShjb25zdCBBdG9taWNT dHJpbmcmIHByZWZpeCwgY29uc3QgY2hhciogbG9jYWxOYW1lLCBjb25zdCBBdG9taWNTdHJpbmcm IG5hbWVzcGFjZVVSSSk7CisgICAgUXVhbGlmaWVkTmFtZShXVEY6Okhhc2hUYWJsZURlbGV0ZWRW YWx1ZVR5cGUpIDogbV9pbXBsKGhhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpKSB7IH0KKyAgICBib29s IGlzSGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9pbXBsID09IGhhc2hU YWJsZURlbGV0ZWRWYWx1ZSgpOyB9CiAgICAgflF1YWxpZmllZE5hbWUoKSB7IGRlcmVmKCk7IH0K ICNpZmRlZiBRTkFNRV9ERUZBVUxUX0NPTlNUUlVDVE9SCiAgICAgUXVhbGlmaWVkTmFtZSgpIDog bV9pbXBsKDApIHsgfQpAQCAtOTIsNiArOTQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5pdChj b25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUs IGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZXNwYWNlVVJJKTsKICAgICB2b2lkIHJlZigpIGNvbnN0 IHsgbV9pbXBsLT5yZWYoKTsgfQogICAgIHZvaWQgZGVyZWYoKTsKKworICAgIHN0YXRpYyBRdWFs aWZpZWROYW1lSW1wbCogaGFzaFRhYmxlRGVsZXRlZFZhbHVlKCkgeyByZXR1cm4gUmVmUHRyPFF1 YWxpZmllZE5hbWVJbXBsPjo6aGFzaFRhYmxlRGVsZXRlZFZhbHVlKCk7IH0KICAgICAKICAgICBR dWFsaWZpZWROYW1lSW1wbCogbV9pbXBsOwogfTsKQEAgLTE2Nyw4ICsxNzEsOCBAQCBuYW1lc3Bh Y2UgV1RGIHsKICAgICB0ZW1wbGF0ZTw+IHN0cnVjdCBIYXNoVHJhaXRzPFdlYkNvcmU6OlF1YWxp ZmllZE5hbWU+IDogR2VuZXJpY0hhc2hUcmFpdHM8V2ViQ29yZTo6UXVhbGlmaWVkTmFtZT4gewog ICAgICAgICBzdGF0aWMgY29uc3QgYm9vbCBlbXB0eVZhbHVlSXNaZXJvID0gZmFsc2U7CiAgICAg ICAgIHN0YXRpYyBXZWJDb3JlOjpRdWFsaWZpZWROYW1lIGVtcHR5VmFsdWUoKSB7IHJldHVybiBX ZWJDb3JlOjpRdWFsaWZpZWROYW1lKFdlYkNvcmU6Om51bGxBdG9tLCBXZWJDb3JlOjpudWxsQXRv bSwgV2ViQ29yZTo6bnVsbEF0b20pOyB9Ci0gICAgICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERl bGV0ZWRWYWx1ZShXZWJDb3JlOjpRdWFsaWZpZWROYW1lJiBzbG90KSB7IG5ldyAoJnNsb3QpIFdl YkNvcmU6OlF1YWxpZmllZE5hbWUoV2ViQ29yZTo6bnVsbEF0b20sIFdlYkNvcmU6OkF0b21pY1N0 cmluZyhIYXNoVGFibGVEZWxldGVkVmFsdWUpLCBXZWJDb3JlOjpudWxsQXRvbSk7IH0KLSAgICAg ICAgc3RhdGljIGJvb2wgaXNEZWxldGVkVmFsdWUoY29uc3QgV2ViQ29yZTo6UXVhbGlmaWVkTmFt ZSYgc2xvdCkgeyByZXR1cm4gc2xvdC5sb2NhbE5hbWUoKS5pc0hhc2hUYWJsZURlbGV0ZWRWYWx1 ZSgpOyB9CisgICAgICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShXZWJDb3Jl OjpRdWFsaWZpZWROYW1lJiBzbG90KSB7IG5ldyAoJnNsb3QpIFdlYkNvcmU6OlF1YWxpZmllZE5h bWUoV1RGOjpIYXNoVGFibGVEZWxldGVkVmFsdWUpOyB9CisgICAgICAgIHN0YXRpYyBib29sIGlz RGVsZXRlZFZhbHVlKGNvbnN0IFdlYkNvcmU6OlF1YWxpZmllZE5hbWUmIHNsb3QpIHsgcmV0dXJu IHNsb3QuaXNIYXNoVGFibGVEZWxldGVkVmFsdWUoKTsgfQogICAgIH07CiB9CiAK