40352 2010-06-08 23:23:47 -0700 [Qt] instance objects created for QObjects are somtimes GC'd 2010-07-27 04:08:37 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 0 smagnuso webkit-qt-unassigned hausmann kling oldest_to_newest 235667 0 smagnuso 2010-06-08 23:23:47 -0700 I have an QObject (A) with a child object (B). B's only reference in the JS engine is through A (ie A.B). I've attached some JS properties (in fact function handlers) to B, and I'm finding that at some point B was getting GC'd. Upon investigation I found that I could create a global reference to B (ie var keep_b = A.B) and the problem would go away - however this is clearly error prone and probably not as intended. I've fixed qt_instance so that it will go about marking 235671 1 58215 smagnuso 2010-06-08 23:32:52 -0700 Created attachment 58215 proposed patch to mark children/dynamic objects created through a qobject 235672 2 smagnuso 2010-06-08 23:34:26 -0700 [accidentally hit commit, cont'd] the attached patch will mark children/dynamic objects after they've been queried through a QtInstance so long as the child/dynamic property is available to QObject. 235934 3 58272 smagnuso 2010-06-09 12:33:02 -0700 Created attachment 58272 proposed patch to mark children/dynamic objects created through a qobject 237306 4 58554 smagnuso 2010-06-12 10:19:38 -0700 Created attachment 58554 Proposed patch with proper coding style 238335 5 58554 jedrzej.nowacki 2010-06-15 05:33:57 -0700 Comment on attachment 58554 Proposed patch with proper coding style The patch doesn't apply cq- There are a few unrelated changes and coding style issues (r-) there are no autotest. You can use check-webkit-style script to check some coding style issues. > + No new tests. (OOPS!) Please provide autotest. > #include "ArgList.h" > +#include "Error.h" > #include "JSDOMBinding.h" > #include "JSGlobalObject.h" > #include "JSLock.h" > +#include "ObjectPrototype.h" > +#include "PropertyNameArray.h" > #include "qt_class.h" > #include "qt_runtime.h" > -#include "PropertyNameArray.h" > #include "runtime_object.h" > -#include "ObjectPrototype.h" > -#include "Error.h" > - foreach(QtInstance* instance, cachedInstances.values(o)) > + foreach (QtInstance* instance, cachedInstances.values(o)) These changes are unrelated (there are more). Please cleanup the patch. > +#if 1 > +#endif This should be avoided. > + } else if ( m_object ) { A coding style issue. 238415 6 smagnuso 2010-06-15 09:15:28 -0700 (In reply to comment #5) > (From update of attachment 58554 [details]) > The patch doesn't apply cq- > There are a few unrelated changes and coding style issues (r-) > there are no autotest. > > You can use check-webkit-style script to check some coding style issues. > I did run check-webkit-style and when I fixed the issues flagged there, you r- it with unrelated changes. Is it the group preference that the old things that didn't pass check-webkit-style get left alone, and I have to ferret out the lines that I change from the output of check-webkit-style? That seems like more work than just fixing the coding style issues. > > + No new tests. (OOPS!) > Please provide autotest. > I'm not sure how to autotest this, it is related to a gc issue and not marking children. Can you point me to a test that is related that I can review? > > #include "ArgList.h" > > +#include "Error.h" > > #include "JSDOMBinding.h" > > #include "JSGlobalObject.h" > > #include "JSLock.h" > > +#include "ObjectPrototype.h" > > +#include "PropertyNameArray.h" > > #include "qt_class.h" > > #include "qt_runtime.h" > > -#include "PropertyNameArray.h" > > #include "runtime_object.h" > > -#include "ObjectPrototype.h" > > -#include "Error.h" > > > - foreach(QtInstance* instance, cachedInstances.values(o)) > > + foreach (QtInstance* instance, cachedInstances.values(o)) > These changes are unrelated (there are more). Please cleanup the patch. > I was fixing what check-webkit-style had flagged - I got the impression it was to pass that script with no errors. > > +#if 1 > > +#endif > This should be avoided. > Agree, will remove. > > + } else if ( m_object ) { > A coding style issue. Can you be more specific? check-webkit-style doesn't flag any issues on the file as it is. 241507 7 59429 smagnuso 2010-06-22 16:08:19 -0700 Created attachment 59429 Rediff against trunk 241853 8 59429 hausmann 2010-06-23 07:56:54 -0700 Comment on attachment 59429 Rediff against trunk WebCore/ChangeLog:13 + No new tests. (OOPS!) If there are no new tests, then please remove this line. However there are some tests for this code in WebKit/qt/tests/qwebframe (don't ask :). Could you add an auto-tests for this case there? WebCore/bridge/qt/qt_instance.cpp:202 + } else if ( m_object ) { Please remove the spaces around m_object. WebCore/bridge/qt/qt_instance.cpp:212 + if ( mark ) { Ditto. 241854 9 hausmann 2010-06-23 07:57:54 -0700 In general however I think this patch looks good (I forgot to mention that earlier) 242861 10 59738 smagnuso 2010-06-24 23:25:16 -0700 Created attachment 59738 Patch 242862 11 smagnuso 2010-06-24 23:26:33 -0700 (In reply to comment #9) > In general however I think this patch looks good (I forgot to mention that earlier) (In reply to comment #8) > (From update of attachment 59429 [details]) > WebCore/ChangeLog:13 > + No new tests. (OOPS!) > If there are no new tests, then please remove this line. > > However there are some tests for this code in WebKit/qt/tests/qwebframe (don't ask :). Could you add an auto-tests for this case there? > > WebCore/bridge/qt/qt_instance.cpp:202 > + } else if ( m_object ) { > Please remove the spaces around m_object. > > WebCore/bridge/qt/qt_instance.cpp:212 > + if ( mark ) { > Ditto. Thanks for the feedback, I've added a test - and fixed the coding style issues. 248758 12 59738 hausmann 2010-07-08 23:16:55 -0700 Comment on attachment 59738 Patch r=me. Thanks for the extensive auto-test! The ChangeLog for WebKit/qt is missing, and there's a stray qDebug. I'll fix it up before landing. 248763 13 hausmann 2010-07-08 23:27:21 -0700 Committed r62898: <http://trac.webkit.org/changeset/62898> 253041 14 kling 2010-07-18 19:24:48 -0700 This change <http://trac.webkit.org/changeset/62898> causes tst_QWebFrame to crash. Reopening. 256506 15 kling 2010-07-27 04:08:37 -0700 I opened bug 43039 for the regression introduced by this change. 58215 2010-06-08 23:32:52 -0700 2010-06-09 12:33:02 -0700 proposed patch to mark children/dynamic objects created through a qobject 0005-Qt-Make-sure-to-mark-all-the-children-and-dynamic-pr.patch text/plain 4759 smagnuso RnJvbSBhN2IyY2MxYWQwNDk0NTAwZmRjYWY2NTU0YmY5OTcyYmE5MzFjOTQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBzbWFnbnVzb24gPHNtYWdudXNvQGdtYWlsLmNvbT4KRGF0ZTog VHVlLCA4IEp1biAyMDEwIDEyOjM2OjIxIC0wNzAwClN1YmplY3Q6IFtQQVRDSCA1LzZdIFtRdF0g TWFrZSBzdXJlIHRvIG1hcmsgYWxsIHRoZSBjaGlsZHJlbiBhbmQgZHluYW1pYyBwcm9wZXJ0aWVz IGluIHRoZSBtYXJrIHBoYXNlIGZvciBhIFF0IGluc3RhbmNlLgoKLS0tCiBXZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAgfCAgIDYwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwIGIvV2Vi Q29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IGQ0MGFiMGIuLjM4MmU2ZWIgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAorKysgYi9XZWJDb3Jl L2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKQEAgLTIxLDIwICsyMSwyMSBAQAogI2luY2x1ZGUg InF0X2luc3RhbmNlLmgiCiAKICNpbmNsdWRlICJBcmdMaXN0LmgiCisjaW5jbHVkZSAiRXJyb3Iu aCIKICNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKICNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5o IgogI2luY2x1ZGUgIkpTTG9jay5oIgorI2luY2x1ZGUgIk9iamVjdFByb3RvdHlwZS5oIgorI2lu Y2x1ZGUgIlByb3BlcnR5TmFtZUFycmF5LmgiCiAjaW5jbHVkZSAicXRfY2xhc3MuaCIKICNpbmNs dWRlICJxdF9ydW50aW1lLmgiCi0jaW5jbHVkZSAiUHJvcGVydHlOYW1lQXJyYXkuaCIKICNpbmNs dWRlICJydW50aW1lX29iamVjdC5oIgotI2luY2x1ZGUgIk9iamVjdFByb3RvdHlwZS5oIgotI2lu Y2x1ZGUgIkVycm9yLmgiCiAKLSNpbmNsdWRlIDxxbWV0YW9iamVjdC5oPgogI2luY2x1ZGUgPHFk ZWJ1Zy5oPgotI2luY2x1ZGUgPHFtZXRhdHlwZS5oPgogI2luY2x1ZGUgPHFoYXNoLmg+CisjaW5j bHVkZSA8cW1ldGFvYmplY3QuaD4KKyNpbmNsdWRlIDxxbWV0YXR5cGUuaD4KKwogCiBuYW1lc3Bh Y2UgSlNDIHsKIG5hbWVzcGFjZSBCaW5kaW5ncyB7CkBAIC0xMTksNyArMTIwLDcgQEAgUGFzc1Jl ZlB0cjxRdEluc3RhbmNlPiBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKFFPYmplY3QqIG8sIFBh c3NSZWZQdHI8Um9vdE9iamUKIHsKICAgICBKU0xvY2sgbG9jayhTaWxlbmNlQXNzZXJ0aW9uc09u bHkpOwogCi0gICAgZm9yZWFjaChRdEluc3RhbmNlKiBpbnN0YW5jZSwgY2FjaGVkSW5zdGFuY2Vz LnZhbHVlcyhvKSkKKyAgICBmb3JlYWNoIChRdEluc3RhbmNlKiBpbnN0YW5jZSwgY2FjaGVkSW5z dGFuY2VzLnZhbHVlcyhvKSkKICAgICAgICAgaWYgKGluc3RhbmNlLT5yb290T2JqZWN0KCkgPT0g cm9vdE9iamVjdCkgewogICAgICAgICAgICAgLy8gVGhlIGdhcmJhZ2UgY29sbGVjdG9yIHJlbW92 ZXMgaW5zdGFuY2VzLCBidXQgaXQgbWF5IGhhcHBlbiB0aGF0IHRoZSB3cmFwcGVkCiAgICAgICAg ICAgICAvLyBRT2JqZWN0IGRpZXMgYmVmb3JlIHRoZSBnYyBraWNrcyBpbi4gVG8gaGFuZGxlIHRo YXQgY2FzZSB3ZSBoYXZlIHRvIGRvIGFuIGFkZGl0aW9uYWwKQEAgLTE1Miw3ICsxNTMsNyBAQCB2 b2lkIFF0SW5zdGFuY2U6OnJlbW92ZUNhY2hlZE1ldGhvZChKU09iamVjdCogbWV0aG9kKQogICAg IGlmIChtX2RlZmF1bHRNZXRob2QgPT0gbWV0aG9kKQogICAgICAgICBtX2RlZmF1bHRNZXRob2Qg PSAwOwogCi0gICAgZm9yKFFIYXNoPFFCeXRlQXJyYXksIEpTT2JqZWN0Kj46Okl0ZXJhdG9yIGl0 ID0gbV9tZXRob2RzLmJlZ2luKCksCisgICAgZm9yIChRSGFzaDxRQnl0ZUFycmF5LCBKU09iamVj dCo+OjpJdGVyYXRvciBpdCA9IG1fbWV0aG9kcy5iZWdpbigpLAogICAgICAgICBlbmQgPSBtX21l dGhvZHMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKICAgICAgICAgaWYgKGl0LnZhbHVlKCkgPT0g bWV0aG9kKSB7CiAgICAgICAgICAgICBtX21ldGhvZHMuZXJhc2UoaXQpOwpAQCAtMTg5LDEwICsx OTAsNDAgQEAgdm9pZCBRdEluc3RhbmNlOjptYXJrQWdncmVnYXRlKE1hcmtTdGFjayYgbWFya1N0 YWNrKQogewogICAgIGlmIChtX2RlZmF1bHRNZXRob2QpCiAgICAgICAgIG1hcmtTdGFjay5hcHBl bmQobV9kZWZhdWx0TWV0aG9kKTsKLSAgICBmb3JlYWNoKEpTT2JqZWN0KiB2YWwsIG1fbWV0aG9k cy52YWx1ZXMoKSkgeworICAgIGZvcmVhY2ggKEpTT2JqZWN0KiB2YWwsIG1fbWV0aG9kcy52YWx1 ZXMoKSkgewogICAgICAgICBpZiAodmFsKQogICAgICAgICAgICAgbWFya1N0YWNrLmFwcGVuZCh2 YWwpOwogICAgIH0KKyNpZiAxCisgICAgZm9yZWFjaCAoUXRGaWVsZCogZmllbGQsIG1fZmllbGRz LnZhbHVlcygpKSB7CisgICAgICAgIGJvb2wgbWFyayA9IGZhbHNlOworICAgICAgICBpZiAoZmll bGQtPmZpZWxkVHlwZSgpID09IFF0RmllbGQ6Ok1ldGFQcm9wZXJ0eSkKKyAgICAgICAgICAgIG1h cmsgPSB0cnVlOworICAgICAgICBlbHNlIGlmIChmaWVsZC0+ZmllbGRUeXBlKCkgPT0gUXRGaWVs ZDo6RHluYW1pY1Byb3BlcnR5KSB7CisgICAgICAgICAgICBpZiAobV9vYmplY3QgJiYgbV9vYmpl Y3QtPmR5bmFtaWNQcm9wZXJ0eU5hbWVzKCkuaW5kZXhPZihmaWVsZC0+bmFtZSgpKSA+PSAwKQor ICAgICAgICAgICAgICAgIG1hcmsgPSB0cnVlOworICAgICAgICB9IGVsc2UgaWYgKCBtX29iamVj dCApIHsKKyAgICAgICAgICAgIFFMaXN0PFFPYmplY3QqPiBjaGlsZHJlbiA9IG1fb2JqZWN0LT5j aGlsZHJlbigpOworICAgICAgICAgICAgZm9yIChpbnQgaW5kZXggPSAwOyBpbmRleCA8IGNoaWxk cmVuLmNvdW50KCk7ICsraW5kZXgpIHsKKyAgICAgICAgICAgICAgICBRT2JqZWN0KiBjaGlsZCA9 IGNoaWxkcmVuLmF0KGluZGV4KTsKKyAgICAgICAgICAgICAgICBpZiAoY2hpbGQtPm9iamVjdE5h bWUoKS50b0xhdGluMSgpID09IGZpZWxkLT5uYW1lKCkpIHsKKyAgICAgICAgICAgICAgICAgICAg bWFyayA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBpZiAoIG1hcmsgKSB7CisgICAg ICAgICAgICBpZiAoIFJlZlB0cjxSb290T2JqZWN0PiBybyA9IHJvb3RPYmplY3QoKSApIHsKKyAg ICAgICAgICAgICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsb2JqID0gcm8tPmdsb2JhbE9iamVj dCgpOworICAgICAgICAgICAgICAgIGlmIChnbG9iYWxvYmopIHsKKyAgICAgICAgICAgICAgICAg ICAgRXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsb2JqLT5nbG9iYWxFeGVjKCk7CisgICAgICAgICAg ICAgICAgICAgIEpTVmFsdWUgdmFsID0gZmllbGQtPnZhbHVlRnJvbUluc3RhbmNlKGV4ZWMsIHRo aXMpOworICAgICAgICAgICAgICAgICAgICBtYXJrU3RhY2suYXBwZW5kKHZhbCk7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorI2VuZGlmCiB9CiAK IHZvaWQgUXRJbnN0YW5jZTo6YmVnaW4oKQpAQCAtMjE2LDI1ICsyNDcsMjIgQEAgdm9pZCBRdElu c3RhbmNlOjpnZXRQcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lQXJy YXkmIGFycmF5KQogICAgICAgICBjb25zdCBRTWV0YU9iamVjdCogbWV0YSA9IG9iai0+bWV0YU9i amVjdCgpOwogCiAgICAgICAgIGludCBpOwotICAgICAgICBmb3IgKGk9MDsgaSA8IG1ldGEtPnBy b3BlcnR5Q291bnQoKTsgaSsrKSB7CisgICAgICAgIGZvciAoaSA9IDA7IGkgPCBtZXRhLT5wcm9w ZXJ0eUNvdW50KCk7IGkrKykgewogICAgICAgICAgICAgUU1ldGFQcm9wZXJ0eSBwcm9wID0gbWV0 YS0+cHJvcGVydHkoaSk7Ci0gICAgICAgICAgICBpZiAocHJvcC5pc1NjcmlwdGFibGUoKSkgewor ICAgICAgICAgICAgaWYgKHByb3AuaXNTY3JpcHRhYmxlKCkpCiAgICAgICAgICAgICAgICAgYXJy YXkuYWRkKElkZW50aWZpZXIoZXhlYywgcHJvcC5uYW1lKCkpKTsKLSAgICAgICAgICAgIH0KICAg ICAgICAgfQogCiAjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKICAgICAgICAgUUxpc3Q8UUJ5dGVB cnJheT4gZHluUHJvcHMgPSBvYmotPmR5bmFtaWNQcm9wZXJ0eU5hbWVzKCk7Ci0gICAgICAgIGZv cmVhY2goUUJ5dGVBcnJheSBiYSwgZHluUHJvcHMpIHsKKyAgICAgICAgZm9yZWFjaCAoUUJ5dGVB cnJheSBiYSwgZHluUHJvcHMpCiAgICAgICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVj LCBiYS5jb25zdERhdGEoKSkpOwotICAgICAgICB9CiAjZW5kaWYKIAotICAgICAgICBmb3IgKGk9 MDsgaSA8IG1ldGEtPm1ldGhvZENvdW50KCk7IGkrKykgeworICAgICAgICBmb3IgKGkgPSAwOyBp IDwgbWV0YS0+bWV0aG9kQ291bnQoKTsgaSsrKSB7CiAgICAgICAgICAgICBRTWV0YU1ldGhvZCBt ZXRob2QgPSBtZXRhLT5tZXRob2QoaSk7Ci0gICAgICAgICAgICBpZiAobWV0aG9kLmFjY2Vzcygp ICE9IFFNZXRhTWV0aG9kOjpQcml2YXRlKSB7CisgICAgICAgICAgICBpZiAobWV0aG9kLmFjY2Vz cygpICE9IFFNZXRhTWV0aG9kOjpQcml2YXRlKQogICAgICAgICAgICAgICAgIGFycmF5LmFkZChJ ZGVudGlmaWVyKGV4ZWMsIG1ldGhvZC5zaWduYXR1cmUoKSkpOwotICAgICAgICAgICAgfQogICAg ICAgICB9CiAgICAgfQogfQotLSAKMS43LjEKCg== 58272 2010-06-09 12:33:02 -0700 2010-06-12 10:19:38 -0700 proposed patch to mark children/dynamic objects created through a qobject 0007-Qt-Make-sure-to-mark-all-the-children-and-dynamic-pr.patch text/plain 5843 smagnuso RnJvbSAzZGVhNWM3YWJjYTdiN2JiMzVmN2YxYWUwZTVhNzhkYWI1ZDAzOGQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBzbWFnbnVzb24gPHNtYWdudXNvQGdtYWlsLmNvbT4KRGF0ZTog VHVlLCA4IEp1biAyMDEwIDEyOjM2OjIxIC0wNzAwClN1YmplY3Q6IFtQQVRDSCA3LzhdIFtRdF0g TWFrZSBzdXJlIHRvIG1hcmsgYWxsIHRoZSBjaGlsZHJlbiBhbmQgZHluYW1pYyBwcm9wZXJ0aWVz IGluIHRoZSBtYXJrIHBoYXNlIGZvciBhIFF0IGluc3RhbmNlLgoKY2hhbmdlbG9nIGZvciBhN2Iy Y2MxYWQwNDk0NTAwZmRjYWY2NTU0YmY5OTcyYmE5MzFjOTQxCi0tLQogV2ViQ29yZS9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysrKysKIFdlYkNvcmUvYnJpZGdlL3F0 L3F0X2luc3RhbmNlLmNwcCB8ICAgNjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2NCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDhhNjIxZDAuLjEyMWFkMTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMDkgIFNhbSBNYW5ndXNv biAgPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIGluc3RhbmNlIG9iamVjdHMgY3JlYXRlZCBmb3IgUU9i amVjdHMgYXJlIHNvbXRpbWVzIEdDJ2QKKwlodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDAzNTIKKworICAgICAgICBJbiBtYXJrQWdncmVnYXRlIGxvb3Agb3ZlciBhbGwg dGhlIGN1cnJlbnQgZmllbGRzIGFuZCBmb3IgYW55IHRoYXQKKwlzdGlsbCBoYXZlIGEgZHluYW1p YyBwcm9wZXJ0eSBvciBhIGNoaWxkLCBtYXJrIHRoZW0gYXMKKwl3ZWxsLiBPdGhlcndpc2UgdGhl IHByb3h5IGluc3RhbmNlIHdpbGwgZ28gYXdheSBhbmQgdGhlIEpTIHRoYXQKKwl3YXMgYm91bmQg dG8gaXQgd2lsbCBiZSBsb3N0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisg ICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6QmluZGlu Z3M6OlF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2UpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6 UXRJbnN0YW5jZTo6cmVtb3ZlQ2FjaGVkTWV0aG9kKToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6 OlF0SW5zdGFuY2U6Om1hcmtBZ2dyZWdhdGUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJ bnN0YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyk6CisKIDIwMTAtMDYtMDkgIFNhbSBNYWdudXNvbiAg PHNtYWdudXNvbkBuZXRmbGl4LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcCBiL1dl YkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAppbmRleCBkNDBhYjBiLi4zODJlNmViIDEw MDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKKysrIGIvV2ViQ29y ZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCkBAIC0yMSwyMCArMjEsMjEgQEAKICNpbmNsdWRl ICJxdF9pbnN0YW5jZS5oIgogCiAjaW5jbHVkZSAiQXJnTGlzdC5oIgorI2luY2x1ZGUgIkVycm9y LmgiCiAjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3Qu aCIKICNpbmNsdWRlICJKU0xvY2suaCIKKyNpbmNsdWRlICJPYmplY3RQcm90b3R5cGUuaCIKKyNp bmNsdWRlICJQcm9wZXJ0eU5hbWVBcnJheS5oIgogI2luY2x1ZGUgInF0X2NsYXNzLmgiCiAjaW5j bHVkZSAicXRfcnVudGltZS5oIgotI2luY2x1ZGUgIlByb3BlcnR5TmFtZUFycmF5LmgiCiAjaW5j bHVkZSAicnVudGltZV9vYmplY3QuaCIKLSNpbmNsdWRlICJPYmplY3RQcm90b3R5cGUuaCIKLSNp bmNsdWRlICJFcnJvci5oIgogCi0jaW5jbHVkZSA8cW1ldGFvYmplY3QuaD4KICNpbmNsdWRlIDxx ZGVidWcuaD4KLSNpbmNsdWRlIDxxbWV0YXR5cGUuaD4KICNpbmNsdWRlIDxxaGFzaC5oPgorI2lu Y2x1ZGUgPHFtZXRhb2JqZWN0Lmg+CisjaW5jbHVkZSA8cW1ldGF0eXBlLmg+CisKIAogbmFtZXNw YWNlIEpTQyB7CiBuYW1lc3BhY2UgQmluZGluZ3MgewpAQCAtMTE5LDcgKzEyMCw3IEBAIFBhc3NS ZWZQdHI8UXRJbnN0YW5jZT4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShRT2JqZWN0KiBvLCBQ YXNzUmVmUHRyPFJvb3RPYmplCiB7CiAgICAgSlNMb2NrIGxvY2soU2lsZW5jZUFzc2VydGlvbnNP bmx5KTsKIAotICAgIGZvcmVhY2goUXRJbnN0YW5jZSogaW5zdGFuY2UsIGNhY2hlZEluc3RhbmNl cy52YWx1ZXMobykpCisgICAgZm9yZWFjaCAoUXRJbnN0YW5jZSogaW5zdGFuY2UsIGNhY2hlZElu c3RhbmNlcy52YWx1ZXMobykpCiAgICAgICAgIGlmIChpbnN0YW5jZS0+cm9vdE9iamVjdCgpID09 IHJvb3RPYmplY3QpIHsKICAgICAgICAgICAgIC8vIFRoZSBnYXJiYWdlIGNvbGxlY3RvciByZW1v dmVzIGluc3RhbmNlcywgYnV0IGl0IG1heSBoYXBwZW4gdGhhdCB0aGUgd3JhcHBlZAogICAgICAg ICAgICAgLy8gUU9iamVjdCBkaWVzIGJlZm9yZSB0aGUgZ2Mga2lja3MgaW4uIFRvIGhhbmRsZSB0 aGF0IGNhc2Ugd2UgaGF2ZSB0byBkbyBhbiBhZGRpdGlvbmFsCkBAIC0xNTIsNyArMTUzLDcgQEAg dm9pZCBRdEluc3RhbmNlOjpyZW1vdmVDYWNoZWRNZXRob2QoSlNPYmplY3QqIG1ldGhvZCkKICAg ICBpZiAobV9kZWZhdWx0TWV0aG9kID09IG1ldGhvZCkKICAgICAgICAgbV9kZWZhdWx0TWV0aG9k ID0gMDsKIAotICAgIGZvcihRSGFzaDxRQnl0ZUFycmF5LCBKU09iamVjdCo+OjpJdGVyYXRvciBp dCA9IG1fbWV0aG9kcy5iZWdpbigpLAorICAgIGZvciAoUUhhc2g8UUJ5dGVBcnJheSwgSlNPYmpl Y3QqPjo6SXRlcmF0b3IgaXQgPSBtX21ldGhvZHMuYmVnaW4oKSwKICAgICAgICAgZW5kID0gbV9t ZXRob2RzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIGlmIChpdC52YWx1ZSgpID09 IG1ldGhvZCkgewogICAgICAgICAgICAgbV9tZXRob2RzLmVyYXNlKGl0KTsKQEAgLTE4OSwxMCAr MTkwLDQwIEBAIHZvaWQgUXRJbnN0YW5jZTo6bWFya0FnZ3JlZ2F0ZShNYXJrU3RhY2smIG1hcmtT dGFjaykKIHsKICAgICBpZiAobV9kZWZhdWx0TWV0aG9kKQogICAgICAgICBtYXJrU3RhY2suYXBw ZW5kKG1fZGVmYXVsdE1ldGhvZCk7Ci0gICAgZm9yZWFjaChKU09iamVjdCogdmFsLCBtX21ldGhv ZHMudmFsdWVzKCkpIHsKKyAgICBmb3JlYWNoIChKU09iamVjdCogdmFsLCBtX21ldGhvZHMudmFs dWVzKCkpIHsKICAgICAgICAgaWYgKHZhbCkKICAgICAgICAgICAgIG1hcmtTdGFjay5hcHBlbmQo dmFsKTsKICAgICB9CisjaWYgMQorICAgIGZvcmVhY2ggKFF0RmllbGQqIGZpZWxkLCBtX2ZpZWxk cy52YWx1ZXMoKSkgeworICAgICAgICBib29sIG1hcmsgPSBmYWxzZTsKKyAgICAgICAgaWYgKGZp ZWxkLT5maWVsZFR5cGUoKSA9PSBRdEZpZWxkOjpNZXRhUHJvcGVydHkpCisgICAgICAgICAgICBt YXJrID0gdHJ1ZTsKKyAgICAgICAgZWxzZSBpZiAoZmllbGQtPmZpZWxkVHlwZSgpID09IFF0Rmll bGQ6OkR5bmFtaWNQcm9wZXJ0eSkgeworICAgICAgICAgICAgaWYgKG1fb2JqZWN0ICYmIG1fb2Jq ZWN0LT5keW5hbWljUHJvcGVydHlOYW1lcygpLmluZGV4T2YoZmllbGQtPm5hbWUoKSkgPj0gMCkK KyAgICAgICAgICAgICAgICBtYXJrID0gdHJ1ZTsKKyAgICAgICAgfSBlbHNlIGlmICggbV9vYmpl Y3QgKSB7CisgICAgICAgICAgICBRTGlzdDxRT2JqZWN0Kj4gY2hpbGRyZW4gPSBtX29iamVjdC0+ Y2hpbGRyZW4oKTsKKyAgICAgICAgICAgIGZvciAoaW50IGluZGV4ID0gMDsgaW5kZXggPCBjaGls ZHJlbi5jb3VudCgpOyArK2luZGV4KSB7CisgICAgICAgICAgICAgICAgUU9iamVjdCogY2hpbGQg PSBjaGlsZHJlbi5hdChpbmRleCk7CisgICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5vYmplY3RO YW1lKCkudG9MYXRpbjEoKSA9PSBmaWVsZC0+bmFtZSgpKSB7CisgICAgICAgICAgICAgICAgICAg IG1hcmsgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgaWYgKCBtYXJrICkgeworICAg ICAgICAgICAgaWYgKCBSZWZQdHI8Um9vdE9iamVjdD4gcm8gPSByb290T2JqZWN0KCkgKSB7Cisg ICAgICAgICAgICAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbG9iaiA9IHJvLT5nbG9iYWxPYmpl Y3QoKTsKKyAgICAgICAgICAgICAgICBpZiAoZ2xvYmFsb2JqKSB7CisgICAgICAgICAgICAgICAg ICAgIEV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbG9iai0+Z2xvYmFsRXhlYygpOworICAgICAgICAg ICAgICAgICAgICBKU1ZhbHVlIHZhbCA9IGZpZWxkLT52YWx1ZUZyb21JbnN0YW5jZShleGVjLCB0 aGlzKTsKKyAgICAgICAgICAgICAgICAgICAgbWFya1N0YWNrLmFwcGVuZCh2YWwpOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKyNlbmRpZgogfQog CiB2b2lkIFF0SW5zdGFuY2U6OmJlZ2luKCkKQEAgLTIxNiwyNSArMjQ3LDIyIEBAIHZvaWQgUXRJ bnN0YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFy cmF5JiBhcnJheSkKICAgICAgICAgY29uc3QgUU1ldGFPYmplY3QqIG1ldGEgPSBvYmotPm1ldGFP YmplY3QoKTsKIAogICAgICAgICBpbnQgaTsKLSAgICAgICAgZm9yIChpPTA7IGkgPCBtZXRhLT5w cm9wZXJ0eUNvdW50KCk7IGkrKykgeworICAgICAgICBmb3IgKGkgPSAwOyBpIDwgbWV0YS0+cHJv cGVydHlDb3VudCgpOyBpKyspIHsKICAgICAgICAgICAgIFFNZXRhUHJvcGVydHkgcHJvcCA9IG1l dGEtPnByb3BlcnR5KGkpOwotICAgICAgICAgICAgaWYgKHByb3AuaXNTY3JpcHRhYmxlKCkpIHsK KyAgICAgICAgICAgIGlmIChwcm9wLmlzU2NyaXB0YWJsZSgpKQogICAgICAgICAgICAgICAgIGFy cmF5LmFkZChJZGVudGlmaWVyKGV4ZWMsIHByb3AubmFtZSgpKSk7Ci0gICAgICAgICAgICB9CiAg ICAgICAgIH0KIAogI2lmbmRlZiBRVF9OT19QUk9QRVJUSUVTCiAgICAgICAgIFFMaXN0PFFCeXRl QXJyYXk+IGR5blByb3BzID0gb2JqLT5keW5hbWljUHJvcGVydHlOYW1lcygpOwotICAgICAgICBm b3JlYWNoKFFCeXRlQXJyYXkgYmEsIGR5blByb3BzKSB7CisgICAgICAgIGZvcmVhY2ggKFFCeXRl QXJyYXkgYmEsIGR5blByb3BzKQogICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhl YywgYmEuY29uc3REYXRhKCkpKTsKLSAgICAgICAgfQogI2VuZGlmCiAKLSAgICAgICAgZm9yIChp PTA7IGkgPCBtZXRhLT5tZXRob2RDb3VudCgpOyBpKyspIHsKKyAgICAgICAgZm9yIChpID0gMDsg aSA8IG1ldGEtPm1ldGhvZENvdW50KCk7IGkrKykgewogICAgICAgICAgICAgUU1ldGFNZXRob2Qg bWV0aG9kID0gbWV0YS0+bWV0aG9kKGkpOwotICAgICAgICAgICAgaWYgKG1ldGhvZC5hY2Nlc3Mo KSAhPSBRTWV0YU1ldGhvZDo6UHJpdmF0ZSkgeworICAgICAgICAgICAgaWYgKG1ldGhvZC5hY2Nl c3MoKSAhPSBRTWV0YU1ldGhvZDo6UHJpdmF0ZSkKICAgICAgICAgICAgICAgICBhcnJheS5hZGQo SWRlbnRpZmllcihleGVjLCBtZXRob2Quc2lnbmF0dXJlKCkpKTsKLSAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgIH0KIH0KLS0gCjEuNy4xCgo= 58554 2010-06-12 10:19:38 -0700 2010-06-22 16:08:19 -0700 Proposed patch with proper coding style bug-40352.patch text/plain 5802 smagnuso RnJvbSBmM2JiZDM5NGZjY2Y3ZGM5YTNjODExOGEwNzJiN2RkMzk2MWJiZTEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogRnJpLCAxMSBKdW4gMjAxMCAyMzozMTo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gaW5zdGFuY2Ugb2JqZWN0cyBjcmVhdGVkIGZvciBRT2JqZWN0cyBhcmUgc29tdGltZXMgR0Mn ZAogYnVnIC0gNDAzNTIKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgIHwg ICAyMCArKysrKysrKysrKysKIFdlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcCB8ICAg NjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCA2NCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFkOWQ3MzkuLmNkNmU0NjMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTAtMDYtMDkgIFNhbSBNYWdudXNvbiAgPHNtYWdudXNvbkBuZXRmbGl4 LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIGluc3RhbmNlIG9iamVjdHMgY3JlYXRlZCBmb3IgUU9iamVjdHMgYXJlIHNvbXRpbWVzIEdD J2QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMzUy CisKKyAgICAgICAgSW4gbWFya0FnZ3JlZ2F0ZSBsb29wIG92ZXIgYWxsIHRoZSBjdXJyZW50IGZp ZWxkcyBhbmQgZm9yIGFueSB0aGF0CisgICAgICAgIHN0aWxsIGhhdmUgYSBkeW5hbWljIHByb3Bl cnR5IG9yIGEgY2hpbGQsIG1hcmsgdGhlbSBhcworICAgICAgICB3ZWxsLiBPdGhlcndpc2UgdGhl IHByb3h5IGluc3RhbmNlIHdpbGwgZ28gYXdheSBhbmQgdGhlIEpTIHRoYXQKKyAgICAgICAgd2Fz IGJvdW5kIHRvIGl0IHdpbGwgYmUgbG9zdC4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BT ISkKKworICAgICAgICAqIGJyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHA6CisgICAgICAgIChKU0M6 OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKToKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OnJlbW92ZUNhY2hlZE1ldGhvZCk6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpRdEluc3RhbmNlOjptYXJrQWdncmVnYXRlKToKKyAgICAgICAgKEpTQzo6QmluZGlu Z3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCiAyMDEwLTA2LTA3ICBKb2NlbHlu IFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9p bnN0YW5jZS5jcHAgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKaW5kZXggZDQw YWIwYi4uMzgyZTZlYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2Uu Y3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMjEsMjAgKzIx LDIxIEBACiAjaW5jbHVkZSAicXRfaW5zdGFuY2UuaCIKIAogI2luY2x1ZGUgIkFyZ0xpc3QuaCIK KyNpbmNsdWRlICJFcnJvci5oIgogI2luY2x1ZGUgIkpTRE9NQmluZGluZy5oIgogI2luY2x1ZGUg IkpTR2xvYmFsT2JqZWN0LmgiCiAjaW5jbHVkZSAiSlNMb2NrLmgiCisjaW5jbHVkZSAiT2JqZWN0 UHJvdG90eXBlLmgiCisjaW5jbHVkZSAiUHJvcGVydHlOYW1lQXJyYXkuaCIKICNpbmNsdWRlICJx dF9jbGFzcy5oIgogI2luY2x1ZGUgInF0X3J1bnRpbWUuaCIKLSNpbmNsdWRlICJQcm9wZXJ0eU5h bWVBcnJheS5oIgogI2luY2x1ZGUgInJ1bnRpbWVfb2JqZWN0LmgiCi0jaW5jbHVkZSAiT2JqZWN0 UHJvdG90eXBlLmgiCi0jaW5jbHVkZSAiRXJyb3IuaCIKIAotI2luY2x1ZGUgPHFtZXRhb2JqZWN0 Lmg+CiAjaW5jbHVkZSA8cWRlYnVnLmg+Ci0jaW5jbHVkZSA8cW1ldGF0eXBlLmg+CiAjaW5jbHVk ZSA8cWhhc2guaD4KKyNpbmNsdWRlIDxxbWV0YW9iamVjdC5oPgorI2luY2x1ZGUgPHFtZXRhdHlw ZS5oPgorCiAKIG5hbWVzcGFjZSBKU0MgewogbmFtZXNwYWNlIEJpbmRpbmdzIHsKQEAgLTExOSw3 ICsxMjAsNyBAQCBQYXNzUmVmUHRyPFF0SW5zdGFuY2U+IFF0SW5zdGFuY2U6OmdldFF0SW5zdGFu Y2UoUU9iamVjdCogbywgUGFzc1JlZlB0cjxSb290T2JqZQogewogICAgIEpTTG9jayBsb2NrKFNp bGVuY2VBc3NlcnRpb25zT25seSk7CiAKLSAgICBmb3JlYWNoKFF0SW5zdGFuY2UqIGluc3RhbmNl LCBjYWNoZWRJbnN0YW5jZXMudmFsdWVzKG8pKQorICAgIGZvcmVhY2ggKFF0SW5zdGFuY2UqIGlu c3RhbmNlLCBjYWNoZWRJbnN0YW5jZXMudmFsdWVzKG8pKQogICAgICAgICBpZiAoaW5zdGFuY2Ut PnJvb3RPYmplY3QoKSA9PSByb290T2JqZWN0KSB7CiAgICAgICAgICAgICAvLyBUaGUgZ2FyYmFn ZSBjb2xsZWN0b3IgcmVtb3ZlcyBpbnN0YW5jZXMsIGJ1dCBpdCBtYXkgaGFwcGVuIHRoYXQgdGhl IHdyYXBwZWQKICAgICAgICAgICAgIC8vIFFPYmplY3QgZGllcyBiZWZvcmUgdGhlIGdjIGtpY2tz IGluLiBUbyBoYW5kbGUgdGhhdCBjYXNlIHdlIGhhdmUgdG8gZG8gYW4gYWRkaXRpb25hbApAQCAt MTUyLDcgKzE1Myw3IEBAIHZvaWQgUXRJbnN0YW5jZTo6cmVtb3ZlQ2FjaGVkTWV0aG9kKEpTT2Jq ZWN0KiBtZXRob2QpCiAgICAgaWYgKG1fZGVmYXVsdE1ldGhvZCA9PSBtZXRob2QpCiAgICAgICAg IG1fZGVmYXVsdE1ldGhvZCA9IDA7CiAKLSAgICBmb3IoUUhhc2g8UUJ5dGVBcnJheSwgSlNPYmpl Y3QqPjo6SXRlcmF0b3IgaXQgPSBtX21ldGhvZHMuYmVnaW4oKSwKKyAgICBmb3IgKFFIYXNoPFFC eXRlQXJyYXksIEpTT2JqZWN0Kj46Okl0ZXJhdG9yIGl0ID0gbV9tZXRob2RzLmJlZ2luKCksCiAg ICAgICAgIGVuZCA9IG1fbWV0aG9kcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQogICAgICAgICBp ZiAoaXQudmFsdWUoKSA9PSBtZXRob2QpIHsKICAgICAgICAgICAgIG1fbWV0aG9kcy5lcmFzZShp dCk7CkBAIC0xODksMTAgKzE5MCw0MCBAQCB2b2lkIFF0SW5zdGFuY2U6Om1hcmtBZ2dyZWdhdGUo TWFya1N0YWNrJiBtYXJrU3RhY2spCiB7CiAgICAgaWYgKG1fZGVmYXVsdE1ldGhvZCkKICAgICAg ICAgbWFya1N0YWNrLmFwcGVuZChtX2RlZmF1bHRNZXRob2QpOwotICAgIGZvcmVhY2goSlNPYmpl Y3QqIHZhbCwgbV9tZXRob2RzLnZhbHVlcygpKSB7CisgICAgZm9yZWFjaCAoSlNPYmplY3QqIHZh bCwgbV9tZXRob2RzLnZhbHVlcygpKSB7CiAgICAgICAgIGlmICh2YWwpCiAgICAgICAgICAgICBt YXJrU3RhY2suYXBwZW5kKHZhbCk7CiAgICAgfQorI2lmIDEKKyAgICBmb3JlYWNoIChRdEZpZWxk KiBmaWVsZCwgbV9maWVsZHMudmFsdWVzKCkpIHsKKyAgICAgICAgYm9vbCBtYXJrID0gZmFsc2U7 CisgICAgICAgIGlmIChmaWVsZC0+ZmllbGRUeXBlKCkgPT0gUXRGaWVsZDo6TWV0YVByb3BlcnR5 KQorICAgICAgICAgICAgbWFyayA9IHRydWU7CisgICAgICAgIGVsc2UgaWYgKGZpZWxkLT5maWVs ZFR5cGUoKSA9PSBRdEZpZWxkOjpEeW5hbWljUHJvcGVydHkpIHsKKyAgICAgICAgICAgIGlmICht X29iamVjdCAmJiBtX29iamVjdC0+ZHluYW1pY1Byb3BlcnR5TmFtZXMoKS5pbmRleE9mKGZpZWxk LT5uYW1lKCkpID49IDApCisgICAgICAgICAgICAgICAgbWFyayA9IHRydWU7CisgICAgICAgIH0g ZWxzZSBpZiAoIG1fb2JqZWN0ICkgeworICAgICAgICAgICAgUUxpc3Q8UU9iamVjdCo+IGNoaWxk cmVuID0gbV9vYmplY3QtPmNoaWxkcmVuKCk7CisgICAgICAgICAgICBmb3IgKGludCBpbmRleCA9 IDA7IGluZGV4IDwgY2hpbGRyZW4uY291bnQoKTsgKytpbmRleCkgeworICAgICAgICAgICAgICAg IFFPYmplY3QqIGNoaWxkID0gY2hpbGRyZW4uYXQoaW5kZXgpOworICAgICAgICAgICAgICAgIGlm IChjaGlsZC0+b2JqZWN0TmFtZSgpLnRvTGF0aW4xKCkgPT0gZmllbGQtPm5hbWUoKSkgeworICAg ICAgICAgICAgICAgICAgICBtYXJrID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGlm ICggbWFyayApIHsKKyAgICAgICAgICAgIGlmICggUmVmUHRyPFJvb3RPYmplY3Q+IHJvID0gcm9v dE9iamVjdCgpICkgeworICAgICAgICAgICAgICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxvYmog PSByby0+Z2xvYmFsT2JqZWN0KCk7CisgICAgICAgICAgICAgICAgaWYgKGdsb2JhbG9iaikgewor ICAgICAgICAgICAgICAgICAgICBFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxvYmotPmdsb2JhbEV4 ZWMoKTsKKyAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZSB2YWwgPSBmaWVsZC0+dmFsdWVGcm9t SW5zdGFuY2UoZXhlYywgdGhpcyk7CisgICAgICAgICAgICAgICAgICAgIG1hcmtTdGFjay5hcHBl bmQodmFsKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICB9CisjZW5kaWYKIH0KIAogdm9pZCBRdEluc3RhbmNlOjpiZWdpbigpCkBAIC0yMTYsMjUgKzI0 NywyMiBAQCB2b2lkIFF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMoRXhlY1N0YXRlKiBleGVj LCBQcm9wZXJ0eU5hbWVBcnJheSYgYXJyYXkpCiAgICAgICAgIGNvbnN0IFFNZXRhT2JqZWN0KiBt ZXRhID0gb2JqLT5tZXRhT2JqZWN0KCk7CiAKICAgICAgICAgaW50IGk7Ci0gICAgICAgIGZvciAo aT0wOyBpIDwgbWV0YS0+cHJvcGVydHlDb3VudCgpOyBpKyspIHsKKyAgICAgICAgZm9yIChpID0g MDsgaSA8IG1ldGEtPnByb3BlcnR5Q291bnQoKTsgaSsrKSB7CiAgICAgICAgICAgICBRTWV0YVBy b3BlcnR5IHByb3AgPSBtZXRhLT5wcm9wZXJ0eShpKTsKLSAgICAgICAgICAgIGlmIChwcm9wLmlz U2NyaXB0YWJsZSgpKSB7CisgICAgICAgICAgICBpZiAocHJvcC5pc1NjcmlwdGFibGUoKSkKICAg ICAgICAgICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBwcm9wLm5hbWUoKSkpOwot ICAgICAgICAgICAgfQogICAgICAgICB9CiAKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAg ICAgICBRTGlzdDxRQnl0ZUFycmF5PiBkeW5Qcm9wcyA9IG9iai0+ZHluYW1pY1Byb3BlcnR5TmFt ZXMoKTsKLSAgICAgICAgZm9yZWFjaChRQnl0ZUFycmF5IGJhLCBkeW5Qcm9wcykgeworICAgICAg ICBmb3JlYWNoIChRQnl0ZUFycmF5IGJhLCBkeW5Qcm9wcykKICAgICAgICAgICAgIGFycmF5LmFk ZChJZGVudGlmaWVyKGV4ZWMsIGJhLmNvbnN0RGF0YSgpKSk7Ci0gICAgICAgIH0KICNlbmRpZgog Ci0gICAgICAgIGZvciAoaT0wOyBpIDwgbWV0YS0+bWV0aG9kQ291bnQoKTsgaSsrKSB7CisgICAg ICAgIGZvciAoaSA9IDA7IGkgPCBtZXRhLT5tZXRob2RDb3VudCgpOyBpKyspIHsKICAgICAgICAg ICAgIFFNZXRhTWV0aG9kIG1ldGhvZCA9IG1ldGEtPm1ldGhvZChpKTsKLSAgICAgICAgICAgIGlm IChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6OlByaXZhdGUpIHsKKyAgICAgICAgICAg IGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6OlByaXZhdGUpCiAgICAgICAgICAg ICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgbWV0aG9kLnNpZ25hdHVyZSgpKSk7Ci0g ICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiB9Ci0tIAoxLjcuMQoK 59429 2010-06-22 16:08:19 -0700 2010-06-24 23:25:12 -0700 Rediff against trunk bug-40352.patch text/plain 2978 smagnuso RnJvbSAxOWIxY2U1N2U2M2E4NDIwZmIyODAxZTkyNjRlM2M2ZTYyYjBhZDU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogTW9uLCAyMSBKdW4gMjAxMCAyMDo1NjozMSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gaW5zdGFuY2Ugb2JqZWN0cyBjcmVhdGVkIGZvciBRT2JqZWN0cyBhcmUgc29tdGltZXMgR0Mn ZAogYnVnLTQwMzUyCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAg MjAgKysrKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNw cCB8ICAgMjggKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA0 OCBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hh bmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjliMTY3OS4uODNlY2IxZSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMyBAQAorMjAxMC0wNi0wOSAgU2FtIE1hZ251c29uICA8c21hZ251c29uQG5ldGZsaXguY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0g aW5zdGFuY2Ugb2JqZWN0cyBjcmVhdGVkIGZvciBRT2JqZWN0cyBhcmUgc29tdGltZXMgR0MnZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzNTIKKwor ICAgICAgICBJbiBtYXJrQWdncmVnYXRlIGxvb3Agb3ZlciBhbGwgdGhlIGN1cnJlbnQgZmllbGRz IGFuZCBmb3IgYW55IHRoYXQKKyAgICAgICAgc3RpbGwgaGF2ZSBhIGR5bmFtaWMgcHJvcGVydHkg b3IgYSBjaGlsZCwgbWFyayB0aGVtIGFzCisgICAgICAgIHdlbGwuIE90aGVyd2lzZSB0aGUgcHJv eHkgaW5zdGFuY2Ugd2lsbCBnbyBhd2F5IGFuZCB0aGUgSlMgdGhhdAorICAgICAgICB3YXMgYm91 bmQgdG8gaXQgd2lsbCBiZSBsb3N0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2UpOgorICAgICAgICAoSlNDOjpCaW5kaW5n czo6UXRJbnN0YW5jZTo6cmVtb3ZlQ2FjaGVkTWV0aG9kKToKKyAgICAgICAgKEpTQzo6QmluZGlu Z3M6OlF0SW5zdGFuY2U6Om1hcmtBZ2dyZWdhdGUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6 UXRJbnN0YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyk6CisKIDIwMTAtMDYtMjEgIFNoZXJpZmYgQm90 ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHI2MTU4NS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3Rh bmNlLmNwcCBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAppbmRleCAxMjI5OTE5 Li5hNDhmYzczIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAK KysrIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCkBAIC0xOTIsNiArMTkyLDM0 IEBAIHZvaWQgUXRJbnN0YW5jZTo6bWFya0FnZ3JlZ2F0ZShNYXJrU3RhY2smIG1hcmtTdGFjaykK ICAgICAgICAgaWYgKHZhbCkKICAgICAgICAgICAgIG1hcmtTdGFjay5hcHBlbmQodmFsKTsKICAg ICB9CisgICAgZm9yZWFjaCAoUXRGaWVsZCogZmllbGQsIG1fZmllbGRzLnZhbHVlcygpKSB7Cisg ICAgICAgIGJvb2wgbWFyayA9IGZhbHNlOworICAgICAgICBpZiAoZmllbGQtPmZpZWxkVHlwZSgp ID09IFF0RmllbGQ6Ok1ldGFQcm9wZXJ0eSkKKyAgICAgICAgICAgIG1hcmsgPSB0cnVlOworICAg ICAgICBlbHNlIGlmIChmaWVsZC0+ZmllbGRUeXBlKCkgPT0gUXRGaWVsZDo6RHluYW1pY1Byb3Bl cnR5KSB7CisgICAgICAgICAgICBpZiAobV9vYmplY3QgJiYgbV9vYmplY3QtPmR5bmFtaWNQcm9w ZXJ0eU5hbWVzKCkuaW5kZXhPZihmaWVsZC0+bmFtZSgpKSA+PSAwKQorICAgICAgICAgICAgICAg IG1hcmsgPSB0cnVlOworICAgICAgICB9IGVsc2UgaWYgKCBtX29iamVjdCApIHsKKyAgICAgICAg ICAgIFFMaXN0PFFPYmplY3QqPiBjaGlsZHJlbiA9IG1fb2JqZWN0LT5jaGlsZHJlbigpOworICAg ICAgICAgICAgZm9yIChpbnQgaW5kZXggPSAwOyBpbmRleCA8IGNoaWxkcmVuLmNvdW50KCk7ICsr aW5kZXgpIHsKKyAgICAgICAgICAgICAgICBRT2JqZWN0KiBjaGlsZCA9IGNoaWxkcmVuLmF0KGlu ZGV4KTsKKyAgICAgICAgICAgICAgICBpZiAoY2hpbGQtPm9iamVjdE5hbWUoKS50b0xhdGluMSgp ID09IGZpZWxkLT5uYW1lKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbWFyayA9IHRydWU7Cisg ICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorICAgICAgICBpZiAoIG1hcmsgKSB7CisgICAgICAgICAgICBpZiAoIFJl ZlB0cjxSb290T2JqZWN0PiBybyA9IHJvb3RPYmplY3QoKSApIHsKKyAgICAgICAgICAgICAgICBK U0dsb2JhbE9iamVjdCogZ2xvYmFsb2JqID0gcm8tPmdsb2JhbE9iamVjdCgpOworICAgICAgICAg ICAgICAgIGlmIChnbG9iYWxvYmopIHsKKyAgICAgICAgICAgICAgICAgICAgRXhlY1N0YXRlKiBl eGVjID0gZ2xvYmFsb2JqLT5nbG9iYWxFeGVjKCk7CisgICAgICAgICAgICAgICAgICAgIEpTVmFs dWUgdmFsID0gZmllbGQtPnZhbHVlRnJvbUluc3RhbmNlKGV4ZWMsIHRoaXMpOworICAgICAgICAg ICAgICAgICAgICBtYXJrU3RhY2suYXBwZW5kKHZhbCk7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgfQorICAgICAgICB9CisgICAgfQogfQogCiB2b2lkIFF0SW5zdGFuY2U6OmJlZ2lu KCkKLS0gCjEuNy4xCgo= 59738 2010-06-24 23:25:16 -0700 2010-07-08 23:16:55 -0700 Patch bug-40352-20100624232515.patch text/plain 9055 smagnuso ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjliMTY3OTZiZGI4ZDIwYTgxNjI0MTk0OGU3MGYwMTk5ODYzOTRiOC4uNzU0ZmM4ODIwNTVlYjI2 MWE5MmYyNzQzNTEzNGI1ZTU5YjI2Nzc3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNi0wOSAgU2Ft IE1hZ251c29uICA8c21hZ251c29uQG5ldGZsaXguY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gaW5zdGFuY2Ugb2JqZWN0cyBjcmVhdGVk IGZvciBRT2JqZWN0cyBhcmUgc29tdGltZXMgR0MnZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzNTIKKworICAgICAgICBJbiBtYXJrQWdncmVnYXRl IGxvb3Agb3ZlciBhbGwgdGhlIGN1cnJlbnQgZmllbGRzIGFuZCBmb3IgYW55IHRoYXQKKyAgICAg ICAgc3RpbGwgaGF2ZSBhIGR5bmFtaWMgcHJvcGVydHkgb3IgYSBjaGlsZCwgbWFyayB0aGVtIGFz CisgICAgICAgIHdlbGwuIE90aGVyd2lzZSB0aGUgcHJveHkgaW5zdGFuY2Ugd2lsbCBnbyBhd2F5 IGFuZCB0aGUgSlMgdGhhdAorICAgICAgICB3YXMgYm91bmQgdG8gaXQgd2lsbCBiZSBsb3N0Lgor CisgICAgICAgIFdlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUKKyAgICAgICAgSSBpbXByb3ZlZCB0 aGUgdGVzdCB0byBjaGVjayBmb3IganNPYmplY3RzIHRoYXQgdGhhdCBhcmUgZ2FyYmFnZSBjb2xs ZWN0ZWQuCisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwOgorICAgICAgICAo SlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZSk6CisgICAgICAgIChKU0M6 OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpyZW1vdmVDYWNoZWRNZXRob2QpOgorICAgICAgICAoSlND OjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6bWFya0FnZ3JlZ2F0ZSk6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpRdEluc3RhbmNlOjpnZXRQcm9wZXJ0eU5hbWVzKToKKwogMjAxMC0wNi0yMSAgU2hl cmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjYxNTg1LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQv cXRfaW5zdGFuY2UuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4 IDEyMjk5MTllZTNiNzVhYzIzZThlNzQ4YjQyNTAzNWEzYjNiNDk0NzkuLjM3MjNlYzA5YzhlNjYw MTFkZGZmNWVhYjVhMTBiMzgwYjI1NjhiNzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0 L3F0X2luc3RhbmNlLmNwcAorKysgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAK QEAgLTE5Miw2ICsxOTIsMzQgQEAgdm9pZCBRdEluc3RhbmNlOjptYXJrQWdncmVnYXRlKE1hcmtT dGFjayYgbWFya1N0YWNrKQogICAgICAgICBpZiAodmFsKQogICAgICAgICAgICAgbWFya1N0YWNr LmFwcGVuZCh2YWwpOwogICAgIH0KKyAgICBmb3JlYWNoIChRdEZpZWxkKiBmaWVsZCwgbV9maWVs ZHMudmFsdWVzKCkpIHsKKyAgICAgICAgYm9vbCBtYXJrID0gZmFsc2U7CisgICAgICAgIGlmIChm aWVsZC0+ZmllbGRUeXBlKCkgPT0gUXRGaWVsZDo6TWV0YVByb3BlcnR5KQorICAgICAgICAgICAg bWFyayA9IHRydWU7CisgICAgICAgIGVsc2UgaWYgKGZpZWxkLT5maWVsZFR5cGUoKSA9PSBRdEZp ZWxkOjpEeW5hbWljUHJvcGVydHkpIHsKKyAgICAgICAgICAgIGlmIChtX29iamVjdCAmJiBtX29i amVjdC0+ZHluYW1pY1Byb3BlcnR5TmFtZXMoKS5pbmRleE9mKGZpZWxkLT5uYW1lKCkpID49IDAp CisgICAgICAgICAgICAgICAgbWFyayA9IHRydWU7CisgICAgICAgIH0gZWxzZSBpZiAobV9vYmpl Y3QpIHsKKyAgICAgICAgICAgIFFMaXN0PFFPYmplY3QqPiBjaGlsZHJlbiA9IG1fb2JqZWN0LT5j aGlsZHJlbigpOworICAgICAgICAgICAgZm9yIChpbnQgaW5kZXggPSAwOyBpbmRleCA8IGNoaWxk cmVuLmNvdW50KCk7ICsraW5kZXgpIHsKKyAgICAgICAgICAgICAgICBRT2JqZWN0KiBjaGlsZCA9 IGNoaWxkcmVuLmF0KGluZGV4KTsKKyAgICAgICAgICAgICAgICBpZiAoY2hpbGQtPm9iamVjdE5h bWUoKS50b0xhdGluMSgpID09IGZpZWxkLT5uYW1lKCkpIHsKKyAgICAgICAgICAgICAgICAgICAg bWFyayA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBpZiAobWFyaykgeworICAgICAg ICAgICAgaWYgKFJlZlB0cjxSb290T2JqZWN0PiBybyA9IHJvb3RPYmplY3QoKSkgeworICAgICAg ICAgICAgICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxvYmogPSByby0+Z2xvYmFsT2JqZWN0KCk7 CisgICAgICAgICAgICAgICAgaWYgKGdsb2JhbG9iaikgeworICAgICAgICAgICAgICAgICAgICBF eGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxvYmotPmdsb2JhbEV4ZWMoKTsKKyAgICAgICAgICAgICAg ICAgICAgSlNWYWx1ZSB2YWwgPSBmaWVsZC0+dmFsdWVGcm9tSW5zdGFuY2UoZXhlYywgdGhpcyk7 CisgICAgICAgICAgICAgICAgICAgIG1hcmtTdGFjay5hcHBlbmQodmFsKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CiB9CiAKIHZvaWQgUXRJbnN0 YW5jZTo6YmVnaW4oKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3Rf cXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5j cHAKaW5kZXggNzZmZGJhMzM2YzI3OTliYmUxNzUwYWM2NDhjY2YwM2MxZjA4NzdhOS4uMzlhY2I5 NWE0OGYwZmI2MmU0ODQ1NjYxZDY3NzUyOTZhMTUwMTRiMiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvdGVzdHMv cXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0zNyw2ICszNyw3IEBACiAjaW5jbHVkZSA8 cXNzbGVycm9yLmg+CiAjZW5kaWYKICNpbmNsdWRlICIuLi91dGlsLmgiCisjaW5jbHVkZSAiLi4v V2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaCIKIAogc3RydWN0IEN1c3Rv bVR5cGUgewogICAgIFFTdHJpbmcgc3RyaW5nOwpAQCAtNTcwLDkgKzU3MSwxMSBAQCBwdWJsaWMg c2xvdHM6CiAgICAgdm9pZCBjbGVhbnVwKCk7CiAKIHByaXZhdGUgc2xvdHM6Ci0gICAgdm9pZCBn ZXRTZXRTdGF0aWNQcm9wZXJ0eSgpOwogICAgIHZvaWQgZ2V0U2V0RHluYW1pY1Byb3BlcnR5KCk7 CisgICAgdm9pZCBnZXRTZXREeW5hbWljUHJvcGVydHlfZGF0YSgpOwogICAgIHZvaWQgZ2V0U2V0 Q2hpbGRyZW4oKTsKKyAgICB2b2lkIGdldFNldENoaWxkcmVuX2RhdGEoKTsKKyAgICB2b2lkIGdl dFNldFN0YXRpY1Byb3BlcnR5KCk7CiAgICAgdm9pZCBjYWxsUXRJbnZva2FibGUoKTsKICAgICB2 b2lkIGNvbm5lY3RBbmREaXNjb25uZWN0KCk7CiAgICAgdm9pZCBjbGFzc0VudW1zKCk7CkBAIC02 NjcsNiArNjcwLDEwIEBAIHByaXZhdGU6CiAgICAgICAgIGV2YWxKUygiZGVsZXRlIHJldHZhbHVl OyBkZWxldGUgdHlwZXZhbHVlIik7CiAgICAgICAgIHJldHVybiByZXQ7CiAgICAgfQorICAgIHZv aWQgZ2FyYmFnZUNvbGxlY3RKUygpCisgICAgeworICAgICAgICBEdW1wUmVuZGVyVHJlZVN1cHBv cnRRdDo6Z2FyYmFnZUNvbGxlY3RvckNvbGxlY3QoKTsKKyAgICB9CiAgICAgUU9iamVjdCogZmly c3RDaGlsZEJ5Q2xhc3NOYW1lKFFPYmplY3QqIHBhcmVudCwgY29uc3QgY2hhciogY2xhc3NOYW1l KSB7CiAgICAgICAgIGNvbnN0IFFPYmplY3RMaXN0ICYgY2hpbGRyZW4gPSBwYXJlbnQtPmNoaWxk cmVuKCk7CiAgICAgICAgIGZvcmVhY2ggKFFPYmplY3QqIGNoaWxkLCBjaGlsZHJlbikgewpAQCAt OTQzLDYgKzk1MCw4IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6Z2V0U2V0U3RhdGljUHJvcGVydHko KQogCiB2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldER5bmFtaWNQcm9wZXJ0eSgpCiB7CisgICAg UUZFVENIKGJvb2wsIGdhcmJhZ2VDb2xsZWN0KTsKKwogICAgIC8vIGluaXRpYWxseSB0aGUgb2Jq ZWN0IGRvZXMgbm90IGhhdmUgdGhlIHByb3BlcnR5CiAgICAgLy8gSW4gV2ViS2l0LCBSdW50aW1l T2JqZWN0cyBkbyBub3QgaW5oZXJpdCBPYmplY3QsIHNvIGRvbid0IGhhdmUgaGFzT3duUHJvcGVy dHkKIApAQCAtOTU0LDExICs5NjMsMzQgQEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpnZXRTZXREeW5h bWljUHJvcGVydHkoKQogICAgIC8vUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5oYXNPd25Qcm9w ZXJ0eSgnZHluYW1pY1Byb3BlcnR5JykiKSwgc1RydWUpOwogICAgIFFDT01QQVJFKGV2YWxKUygi dHlwZW9mIG15T2JqZWN0LmR5bmFtaWNQcm9wZXJ0eSAhPSAndW5kZWZpbmVkJyIpLCBzVHJ1ZSk7 CiAgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5keW5hbWljUHJvcGVydHkgPT0gMTIzIiks IHNUcnVlKTsKKyAgICBpZiggZ2FyYmFnZUNvbGxlY3QgKSB7CisgICAgICAgIGdhcmJhZ2VDb2xs ZWN0SlMoKTsKKyAgICAgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3QuZHluYW1p Y1Byb3BlcnR5ICE9ICd1bmRlZmluZWQnIiksIHNUcnVlKTsKKyAgICB9CiAKICAgICAvLyBwcm9w ZXJ0eSBjaGFuZ2UgaW4gc2NyaXB0IHNob3VsZCBiZSByZWZsZWN0ZWQgaW4gQysrCiAgICAgUUNP TVBBUkUoZXZhbEpTKCJteU9iamVjdC5keW5hbWljUHJvcGVydHkgPSAnZm9vJzsiCiAgICAgICAg ICAgICAgICAgICAgICJteU9iamVjdC5keW5hbWljUHJvcGVydHkiKSwgUUxhdGluMVN0cmluZygi Zm9vIikpOwogICAgIFFDT01QQVJFKG1fbXlPYmplY3QtPnByb3BlcnR5KCJkeW5hbWljUHJvcGVy dHkiKS50b1N0cmluZygpLCBRTGF0aW4xU3RyaW5nKCJmb28iKSk7CisgICAgaWYoIGdhcmJhZ2VD b2xsZWN0ICkgeworICAgICAgICBnYXJiYWdlQ29sbGVjdEpTKCk7CisgICAgICAgIFFDT01QQVJF KG1fbXlPYmplY3QtPnByb3BlcnR5KCJkeW5hbWljUHJvcGVydHkiKS50b1N0cmluZygpLCBRTGF0 aW4xU3RyaW5nKCJmb28iKSk7CisgICAgfQorCisgICAgLy8gYWRkIGEgZHluYW1pYyBwcm9wZXJ0 eSBpbiBDKysgdG8gYW5vdGhlciBRT2JqZWN0CisgICAgUU9iamVjdCogcHJvcGVydHlPYmplY3Qg PSBuZXcgUU9iamVjdChtX215T2JqZWN0KTsKKyAgICBRQ09NUEFSRShtX215T2JqZWN0LT5zZXRQ cm9wZXJ0eSgiZHluYW1pY09iamVjdFByb3BlcnR5IiwgcVZhcmlhbnRGcm9tVmFsdWUocHJvcGVy dHlPYmplY3QpKSwgZmFsc2UpOworICAgIFFDT01QQVJFKGV2YWxKUygidHlwZW9mIG15T2JqZWN0 LmR5bmFtaWNPYmplY3RQcm9wZXJ0eSAhPSAndW5kZWZpbmVkJyIpLCBzVHJ1ZSk7CisgICAgZXZh bEpTKCJteU9iamVjdC5keW5hbWljT2JqZWN0UHJvcGVydHkuanNQcm9wZXJ0eSA9IDEyMyIpOwor ICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3QuZHluYW1pY09iamVjdFByb3BlcnR5LmpzUHJv cGVydHkgPT0gMTIzIiksIHNUcnVlKTsKKyAgICBpZiggZ2FyYmFnZUNvbGxlY3QgKSB7CisgICAg ICAgIGdhcmJhZ2VDb2xsZWN0SlMoKTsKKyAgICAgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2Yg bXlPYmplY3QuZHluYW1pY09iamVjdFByb3BlcnR5ICE9ICd1bmRlZmluZWQnIiksIHNUcnVlKTsK KyAgICAgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5keW5hbWljT2JqZWN0UHJvcGVydHku anNQcm9wZXJ0eSA9PSAxMjMiKSwgc1RydWUpOworICAgIH0KKyAgICBRQ09NUEFSRShtX215T2Jq ZWN0LT5zZXRQcm9wZXJ0eSgiZHluYW1pY09iamVjdFByb3BlcnR5IiwgUVZhcmlhbnQoKSksIGZh bHNlKTsKKyAgICBkZWxldGUgcHJvcGVydHlPYmplY3Q7CisgICAgUUNPTVBBUkUoZXZhbEpTKCJ0 eXBlb2YgbXlPYmplY3QuZHluYW1pY09iamVjdFByb3BlcnR5ID09ICd1bmRlZmluZWQnIiksIHNU cnVlKTsKIAogICAgIC8vIGRlbGV0ZSB0aGUgcHJvcGVydHkgKFhGQUlMIC0gY2FuJ3QgZGVsZXRl IHByb3BlcnRpZXMpCiAgICAgUUVYUEVDVF9GQUlMKCIiLCAiY2FuJ3QgZGVsZXRlIHByb3BlcnRp ZXMiLCBDb250aW51ZSk7CkBAIC05NjksMTAgKzEwMDEsMjIgQEAgdm9pZCB0c3RfUVdlYkZyYW1l OjpnZXRTZXREeW5hbWljUHJvcGVydHkoKQogICAgIC8vICAgIFFDT01QQVJFKGV2YWxKUygibXlP YmplY3QuaGFzT3duUHJvcGVydHkoJ2R5bmFtaWNQcm9wZXJ0eScpIiksIHNGYWxzZSk7CiAgICAg UUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3QuZHluYW1pY1Byb3BlcnR5IiksIHNVbmRl ZmluZWQpOwogICAgICovCisKKyAgICBldmFsSlMoIm15T2JqZWN0LmR5bmFtaWNQcm9wZXJ0eSA9 IHVuZGVmaW5lZCIpOworfQorCit2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldER5bmFtaWNQcm9w ZXJ0eV9kYXRhKCkKK3sKKyAgICBRVGVzdDo6YWRkQ29sdW1uPGJvb2w+KCJnYXJiYWdlQ29sbGVj dCIpOworICAgIFFUZXN0OjpuZXdSb3coIndpdGggZ2FyYmFnZUNvbGxlY3QiKSA8PCB0cnVlOwor ICAgIFFUZXN0OjpuZXdSb3coIndpdGhvdXQgZ2FyYmFnZUNvbGxlY3QiKSA8PCBmYWxzZTsKIH0K IAogdm9pZCB0c3RfUVdlYkZyYW1lOjpnZXRTZXRDaGlsZHJlbigpCiB7CisgICAgUUZFVENIKGJv b2wsIGdhcmJhZ2VDb2xsZWN0KTsKKyAgICBxRGVidWcoKSA8PCAiR28iOworCiAgICAgLy8gaW5p dGlhbGx5IHRoZSBvYmplY3QgZG9lcyBub3QgaGF2ZSB0aGUgY2hpbGQKICAgICAvLyAoYWdhaW4s IG5vIGhhc093blByb3BlcnR5KQogCkBAIC05ODQsMTIgKzEwMjgsMjcgQEAgdm9pZCB0c3RfUVdl YkZyYW1lOjpnZXRTZXRDaGlsZHJlbigpCiAgICAgY2hpbGQtPnNldE9iamVjdE5hbWUoImNoaWxk Iik7CiAvLyAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC5oYXNPd25Qcm9wZXJ0eSgnY2hpbGQn KSIpLCBzVHJ1ZSk7CiAgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3QuY2hpbGQg IT0gJ3VuZGVmaW5lZCciKSwgc1RydWUpOworICAgIGV2YWxKUygibXlPYmplY3QuY2hpbGQuanNQ cm9wZXJ0eSA9IDEyMyIpOworICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3QuY2hpbGQuanNQ cm9wZXJ0eSA9PSAxMjMiKSwgc1RydWUpOworCisgICAgaWYoIGdhcmJhZ2VDb2xsZWN0ICkgewor ICAgICAgICBnYXJiYWdlQ29sbGVjdEpTKCk7CisgICAgICAgIFFDT01QQVJFKGV2YWxKUygidHlw ZW9mIG15T2JqZWN0LmNoaWxkICE9ICd1bmRlZmluZWQnIiksIHNUcnVlKTsKKyAgICAgICAgUUNP TVBBUkUoZXZhbEpTKCJteU9iamVjdC5jaGlsZC5qc1Byb3BlcnR5ID09IDEyMyIpLCBzVHJ1ZSk7 CisgICAgfQogCiAgICAgLy8gYWRkIGEgZ3JhbmRjaGlsZAogICAgIE15UU9iamVjdCogZ3JhbmRD aGlsZCA9IG5ldyBNeVFPYmplY3QoY2hpbGQpOwogICAgIGdyYW5kQ2hpbGQtPnNldE9iamVjdE5h bWUoImdyYW5kQ2hpbGQiKTsKIC8vICBRQ09NUEFSRShldmFsSlMoIm15T2JqZWN0LmNoaWxkLmhh c093blByb3BlcnR5KCdncmFuZENoaWxkJykiKSwgc1RydWUpOwogICAgIFFDT01QQVJFKGV2YWxK UygidHlwZW9mIG15T2JqZWN0LmNoaWxkLmdyYW5kQ2hpbGQgIT0gJ3VuZGVmaW5lZCciKSwgc1Ry dWUpOworICAgIGV2YWxKUygibXlPYmplY3QuY2hpbGQuZ3JhbmRDaGlsZC5qc1Byb3BlcnR5ID0g MTIzIik7CisgICAgZXZhbEpTKCJteU9iamVjdC5jaGlsZC5ncmFuZENoaWxkLmpzUHJvcGVydHkg PSAxMjMiKTsKKyAgICBpZiggZ2FyYmFnZUNvbGxlY3QgKSB7CisgICAgICAgIGdhcmJhZ2VDb2xs ZWN0SlMoKTsKKyAgICAgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3QuY2hpbGQu Z3JhbmRDaGlsZCAhPSAndW5kZWZpbmVkJyIpLCBzVHJ1ZSk7CisgICAgICAgIFFDT01QQVJFKGV2 YWxKUygibXlPYmplY3QuY2hpbGQuZ3JhbmRDaGlsZC5qc1Byb3BlcnR5ID09IDEyMyIpLCBzVHJ1 ZSk7CisgICAgfQogCiAgICAgLy8gZGVsZXRlIGdyYW5kY2hpbGQKICAgICBkZWxldGUgZ3JhbmRD aGlsZDsKQEAgLTEwMDAsNiArMTA1OSwxOCBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldENo aWxkcmVuKCkKICAgICBkZWxldGUgY2hpbGQ7CiAvLyAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVj dC5oYXNPd25Qcm9wZXJ0eSgnY2hpbGQnKSIpLCBzRmFsc2UpOwogICAgIFFDT01QQVJFKGV2YWxK UygidHlwZW9mIG15T2JqZWN0LmNoaWxkID09ICd1bmRlZmluZWQnIiksIHNUcnVlKTsKKyAgICBp ZiggZ2FyYmFnZUNvbGxlY3QgKSB7CisgICAgICAgIGdhcmJhZ2VDb2xsZWN0SlMoKTsKKyAgICAg ICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3QuY2hpbGQgPT0gJ3VuZGVmaW5lZCci KSwgc1RydWUpOworICAgIH0KK30KKworCit2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldENoaWxk cmVuX2RhdGEoKQoreworICAgIFFUZXN0OjphZGRDb2x1bW48Ym9vbD4oImdhcmJhZ2VDb2xsZWN0 Iik7CisgICAgUVRlc3Q6Om5ld1Jvdygid2l0aCBnYXJiYWdlQ29sbGVjdCIpIDw8IHRydWU7Cisg ICAgUVRlc3Q6Om5ld1Jvdygid2l0aG91dCBnYXJiYWdlQ29sbGVjdCIpIDw8IGZhbHNlOwogfQog CiBRX0RFQ0xBUkVfTUVUQVRZUEUoUVZlY3RvcjxpbnQ+KQpAQCAtMTY2Niw3ICsxNzM3LDcgQEAg dm9pZCB0c3RfUVdlYkZyYW1lOjpjb25uZWN0QW5kRGlzY29ubmVjdCgpCiAgICAgbV9teU9iamVj dC0+ZW1pdE15U2lnbmFsKCk7CiAgICAgUUNPTVBBUkUobV9teU9iamVjdC0+cXRGdW5jdGlvbklu dm9rZWQoKSwgMjApOwogICAgIGV2YWxKUygibXlPYmplY3QgPSBudWxsIik7Ci0gICAgZXZhbEpT KCJnYygpIik7CisgICAgZ2FyYmFnZUNvbGxlY3RKUygpOwogICAgIG1fbXlPYmplY3QtPnJlc2V0 UXRGdW5jdGlvbkludm9rZWQoKTsKICAgICBtX215T2JqZWN0LT5lbWl0TXlTaWduYWwoKTsKICAg ICBRQ09NUEFSRShtX215T2JqZWN0LT5xdEZ1bmN0aW9uSW52b2tlZCgpLCAyMCk7Cg==