115033 2013-04-23 06:32:20 -0700 Add move semantics to RefPtr 2013-04-26 07:55:37 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mikhail.pozdnyakov mikhail.pozdnyakov andersca ap benjamin buildbot cmarcelo commit-queue darin rniwa oldest_to_newest 879815 0 mikhail.pozdnyakov 2013-04-23 06:32:20 -0700 SSIA. That would allow us to obviate unnecessary reffing/ureffing when RefPtr is created or assigned from rvalue references. 879835 1 199233 mikhail.pozdnyakov 2013-04-23 07:33:46 -0700 Created attachment 199233 patch 879836 2 commit-queue 2013-04-23 07:35:49 -0700 Attachment 199233 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/RefPtr.h']" exit_code: 1 Source/WTF/wtf/RefPtr.h:84: Missing spaces around && [whitespace/operators] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 879837 3 199233 andersca 2013-04-23 07:44:02 -0700 Comment on attachment 199233 patch View in context: https://bugs.webkit.org/attachment.cgi?id=199233&action=review This is great, but I'd appreciate if you could upload a new patch so we can let the EWS bots chew at it - it's a pretty fundamental change and it could break the build in weird wais. > Source/WTF/wtf/RefPtr.h:47 > + ALWAYS_INLINE RefPtr(RefPtr&& o) : m_ptr(o.get()) { o.m_ptr = 0; } I think this would read better as RefPtr(RefPtr&& o) : m_ptr(o.release().leakRef()) { } > Source/WTF/wtf/RefPtr.h:48 > + template<typename U> RefPtr(RefPtr<U>&& o) : m_ptr(o.get()) { o.m_ptr = 0; } Same thing here. > Source/WTF/wtf/RefPtr.h:163 > + if (m_ptr != o.get()) { > + derefIfNotNull(m_ptr); > + m_ptr = o.get(); > + o.m_ptr = 0; > + } > + return *this; I think this could just be m_ptr = o.release(); > Source/WTF/wtf/RefPtr.h:172 > + if (m_ptr != o.get()) { > + derefIfNotNull(m_ptr); > + m_ptr = o.get(); > + o.m_ptr = 0; > + } Ditto. 879845 4 199236 mikhail.pozdnyakov 2013-04-23 07:52:44 -0700 Created attachment 199236 patch v2 Updated due to comments from Anders. Thanks Anders! 879860 5 199236 andersca 2013-04-23 08:02:31 -0700 Comment on attachment 199236 patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=199236&action=review > Source/WTF/wtf/RefPtr.h:85 > + RefPtr& operator=(RefPtr&& o) { m_ptr = o.release(); } > + template<typename U> RefPtr& operator=(RefPtr<U>&& o) { m_ptr = o.release(); } These will cause a memory leak now, and return *this is gone. Let's change them back into what you had before; something like: if (m_ptr != o.m_ptr)) { derefIfNotNull(m_ptr); m_ptr = o.release().leakRef(); } return *this; 879867 6 mikhail.pozdnyakov 2013-04-23 08:19:04 -0700 (In reply to comment #5) > (From update of attachment 199236 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=199236&action=review > > > Source/WTF/wtf/RefPtr.h:85 > > + RefPtr& operator=(RefPtr&& o) { m_ptr = o.release(); } > > + template<typename U> RefPtr& operator=(RefPtr<U>&& o) { m_ptr = o.release(); } > > These will cause a memory leak now, and return *this is gone. omg! that's my absent-mindedness :( 879872 7 199244 mikhail.pozdnyakov 2013-04-23 08:28:40 -0700 Created attachment 199244 patch v3 fixed assignment operators :/ 879873 8 commit-queue 2013-04-23 08:29:38 -0700 Attachment 199244 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/RefPtr.h']" exit_code: 1 Source/WTF/wtf/RefPtr.h:86: Missing spaces around && [whitespace/operators] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 879965 9 ap 2013-04-23 10:30:56 -0700 > That would allow us to obviate unnecessary reffing/ureffing when RefPtr is created or assigned from rvalue references. Do we have examples of that in WebKit now? We are supposed to use PassRefPtr for poor man's move semantics. To be clear, I certainly don't object to this change. 879981 10 benjamin 2013-04-23 11:10:22 -0700 (In reply to comment #9) > > That would allow us to obviate unnecessary reffing/ureffing when RefPtr is created or assigned from rvalue references. > > Do we have examples of that in WebKit now? We are supposed to use PassRefPtr for poor man's move semantics. There is no explicit use of rvalue reference, but clang is smart enough to use it in some cases. 880020 11 199244 benjamin 2013-04-23 11:19:09 -0700 Comment on attachment 199244 patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=199244&action=review > Source/WTF/wtf/RefPtr.h:160 > + if (m_ptr != o.get()) { > + derefIfNotNull(m_ptr); > + m_ptr = o.release().leakRef(); > + } > + return *this; I don't understand why you do this. If you have RefPtr a = [foobar]; RefPtr b = a; a = std::move(b); "b" is unchanged, and the refcount is +2. This is counter-intuitive for move semantic. > Source/WTF/wtf/RefPtr.h:169 > + if (m_ptr != o.get()) { > + derefIfNotNull(m_ptr); > + m_ptr = o.release().leakRef(); > + } > + return *this; ditto 880431 12 199413 mikhail.pozdnyakov 2013-04-24 04:38:19 -0700 Created attachment 199413 patch v4 Addresses Benjamin's concern. 880433 13 commit-queue 2013-04-24 04:40:28 -0700 Attachment 199413 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/RefPtr.h']" exit_code: 1 Source/WTF/wtf/RefPtr.h:86: Missing spaces around && [whitespace/operators] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 880806 14 199413 benjamin 2013-04-24 14:42:05 -0700 Comment on attachment 199413 patch v4 View in context: https://bugs.webkit.org/attachment.cgi?id=199413&action=review > Source/WTF/wtf/RefPtr.h:159 > + T* ptr = m_ptr; > + m_ptr = o.release().leakRef(); > + derefIfNotNull(ptr); > + return *this; With this, what if I do this? RefPtr a = [...]; a = std::move(a); 881139 15 mikhail.pozdnyakov 2013-04-25 01:26:23 -0700 (In reply to comment #14) > (From update of attachment 199413 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=199413&action=review > > > Source/WTF/wtf/RefPtr.h:159 > > + T* ptr = m_ptr; > > + m_ptr = o.release().leakRef(); > > + derefIfNotNull(ptr); > > + return *this; > > With this, what if I do this? > > RefPtr a = [...]; > a = std::move(a); mm, wouldn't it mean that we do not care about 'a' anymore? so that looks like caller's fault. btw, in RetainPtr we have exactly same implementation: template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(RetainPtr<T>&& o) { adoptCF(o.leakRef()); return *this; } and template<typename T> inline void RetainPtr<T>::adoptCF(PtrType optr) { PtrType ptr = m_ptr; m_ptr = optr; if (ptr) CFRelease(ptr); } 881262 16 andersca 2013-04-25 08:18:08 -0700 (In reply to comment #11) > (From update of attachment 199244 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=199244&action=review > > > Source/WTF/wtf/RefPtr.h:160 > > + if (m_ptr != o.get()) { > > + derefIfNotNull(m_ptr); > > + m_ptr = o.release().leakRef(); > > + } > > + return *this; > > I don't understand why you do this. My mistake, I think this check should just be: if (this != &o) { ... } 881273 17 mikhail.pozdnyakov 2013-04-25 08:42:15 -0700 (In reply to comment #15) > (In reply to comment #14) > > (From update of attachment 199413 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=199413&action=review > > > > > Source/WTF/wtf/RefPtr.h:159 > > > + T* ptr = m_ptr; > > > + m_ptr = o.release().leakRef(); > > > + derefIfNotNull(ptr); > > > + return *this; > > > > With this, what if I do this? > > > > RefPtr a = [...]; > > a = std::move(a); > > mm, wouldn't it mean that we do not care about 'a' anymore? so that looks like caller's fault. > btw, in RetainPtr we have exactly same implementation: > template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(RetainPtr<T>&& o) > { > adoptCF(o.leakRef()); > return *this; > } > > and > > template<typename T> inline void RetainPtr<T>::adoptCF(PtrType optr) > { > PtrType ptr = m_ptr; > m_ptr = optr; > if (ptr) > CFRelease(ptr); > } yeah, with RetainPtr it's different as it\s releasing m_ptr which is 0 after leakPtr() call. 881483 18 199733 mikhail.pozdnyakov 2013-04-25 12:11:26 -0700 Created attachment 199733 patch v5 Fixed '=' operator. 881487 19 commit-queue 2013-04-25 12:12:26 -0700 Attachment 199733 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/RefPtr.h']" exit_code: 1 Source/WTF/wtf/RefPtr.h:86: Missing spaces around && [whitespace/operators] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 881530 20 199733 buildbot 2013-04-25 13:16:04 -0700 Comment on attachment 199733 patch v5 Attachment 199733 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/144200 881531 21 199733 buildbot 2013-04-25 13:24:26 -0700 Comment on attachment 199733 patch v5 Attachment 199733 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/175534 881555 22 199733 darin 2013-04-25 14:22:03 -0700 Comment on attachment 199733 patch v5 View in context: https://bugs.webkit.org/attachment.cgi?id=199733&action=review > Source/WTF/wtf/RefPtr.h:168 > + if (this != &o) { > + derefIfNotNull(m_ptr); > + m_ptr = o.release().leakRef(); > + } It’s difficult to get this right; often this and &o are not objects of the same type, so we can’t compare them. I suggest we instead consider the canonical operator= implementation: RefPtr<T> ptr = o; swap(ptr); return *this; We could use this for both operator= overloads. As long as it compiles to efficient-enough code. 881557 23 199733 buildbot 2013-04-25 14:23:56 -0700 Comment on attachment 199733 patch v5 Attachment 199733 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/19238 881559 24 andersca 2013-04-25 14:27:34 -0700 (In reply to comment #22) . > > I suggest we instead consider the canonical operator= implementation: > > RefPtr<T> ptr = o; > swap(ptr); > return *this; I like that. The first row should be RefPtr<T> ptr = std::move(o); 881767 25 mikhail.pozdnyakov 2013-04-26 01:54:10 -0700 (In reply to comment #24) > (In reply to comment #22) > . > > > > I suggest we instead consider the canonical operator= implementation: > > > > RefPtr<T> ptr = o; > > swap(ptr); > > return *this; > > I like that. The first row should be > > RefPtr<T> ptr = std::move(o); That's great! but how about just RefPtr<T>(std::move(o)).swap(*this); return *this; 881772 26 199804 mikhail.pozdnyakov 2013-04-26 02:09:44 -0700 Created attachment 199804 patch v6 Canonical '=' operator implementation. 881773 27 commit-queue 2013-04-26 02:12:14 -0700 Attachment 199804 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/RefPtr.h']" exit_code: 1 Source/WTF/wtf/RefPtr.h:87: Missing spaces around && [whitespace/operators] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 881887 28 199804 andersca 2013-04-26 07:36:27 -0700 Comment on attachment 199804 patch v6 (In reply to comment #25) > That's great! but how about just > > RefPtr<T>(std::move(o)).swap(*this); > return *this; I think it's easier to read with an explicit temporary. Please make that change, r=me. 881897 29 mikhail.pozdnyakov 2013-04-26 07:55:37 -0700 Committed r149184: <http://trac.webkit.org/changeset/149184> 199233 2013-04-23 07:33:46 -0700 2013-04-23 07:52:44 -0700 patch bug115033 text/plain 2990 mikhail.pozdnyakov Y29tbWl0IGNhMTdlNjc1ZmU4YmM5OTg2Y2E5NmE5MWYwMjFhZTI0OGZhZDFmYWQKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIEFwciAyMyAxNjo1MTo0NCAyMDEzICswMzAwCgogICAgYnVnMTE1MDMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCAwOTk5 ZWNmLi5kNjAxMWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTIzICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIEFkZCBt b3ZlIHNlbWFudGljcyB0byBSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50 IG9wZXJhdG9ycyB0byBSZWZQdHIgd2hlbgorICAgICAgICBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpLgorICAgICAgICBUaGlzIG9idmlhdGVzIHVubmVjZXNzYXJ5IHJl ZmZpbmcvdXJlZmZpbmcgd2hlbiBSZWZQdHIgaXMgY3JlYXRlZAorICAgICAgICBvciBhc3NpZ25l ZCBmcm9tIHJ2YWx1ZSByZWZlcmVuY2VzLgorCisgICAgICAgICogd3RmL1JlZlB0ci5oOgorICAg ICAgICAoUmVmUHRyKToKKyAgICAgICAgKFdURjo6UmVmUHRyOjpSZWZQdHIpOgorICAgICAgICAo V1RGOjpSZWZQdHI6Om9wZXJhdG9yPSk6CisKIDIwMTMtMDQtMjEgIEJlbmphbWluIFBvdWxhaW4g IDxiZW5qYW1pbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEltcHJvdmUgU3RyaW5nSW1wbCBjb2Rl IGRlbnNpdHkgZm9yIG9sZGVyIEFSTSBoYXJkd2FyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvUmVmUHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAppbmRleCAzMjJjYmQ2Li5jZWNj NjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9SZWZQdHIuaApAQCAtNDMsNiArNDMsMTEgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAg IEFMV0FZU19JTkxJTkUgUmVmUHRyKGNvbnN0IFJlZlB0ciYgbykgOiBtX3B0cihvLm1fcHRyKSB7 IHJlZklmTm90TnVsbChtX3B0cik7IH0KICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gUmVm UHRyKGNvbnN0IFJlZlB0cjxVPiYgbykgOiBtX3B0cihvLmdldCgpKSB7IHJlZklmTm90TnVsbCht X3B0cik7IH0KIAorI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9SVkFMVUVfUkVGRVJFTkNFUykK KyAgICAgICAgQUxXQVlTX0lOTElORSBSZWZQdHIoUmVmUHRyJiYgbykgOiBtX3B0cihvLmdldCgp KSB7IG8ubV9wdHIgPSAwOyB9CisgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0cihS ZWZQdHI8VT4mJiBvKSA6IG1fcHRyKG8uZ2V0KCkpIHsgby5tX3B0ciA9IDA7IH0KKyNlbmRpZgor CiAgICAgICAgIC8vIFNlZSBjb21tZW50cyBpbiBQYXNzUmVmUHRyLmggZm9yIGFuIGV4cGxhbmF0 aW9uIG9mIHdoeSB0aGlzIHRha2VzIGEgY29uc3QgcmVmZXJlbmNlLgogICAgICAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBVPiBSZWZQdHIoY29uc3QgUGFzc1JlZlB0cjxVPiYpOwogCkBAIC03NSw2ICs4 MCwxMSBAQCBuYW1lc3BhY2UgV1RGIHsKICNpZiAhQ09NUElMRVJfU1VQUE9SVFMoQ1hYX05VTExQ VFIpCiAgICAgICAgIFJlZlB0ciYgb3BlcmF0b3I9KHN0ZDo6bnVsbHB0cl90KSB7IGNsZWFyKCk7 IHJldHVybiAqdGhpczsgfQogI2VuZGlmCisjaWYgQ09NUElMRVJfU1VQUE9SVFMoQ1hYX1JWQUxV RV9SRUZFUkVOQ0VTKQorICAgICAgICBSZWZQdHImIG9wZXJhdG9yPShSZWZQdHImJik7CisgICAg ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0ciYgb3BlcmF0b3I9KFJlZlB0cjxVPiYmKTsK KyNlbmRpZgorCiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0ciYgb3BlcmF0b3I9 KGNvbnN0IFJlZlB0cjxVPiYpOwogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHIm IG9wZXJhdG9yPShjb25zdCBQYXNzUmVmUHRyPFU+Jik7CiAKQEAgLTE0Miw3ICsxNTIsMjcgQEAg bmFtZXNwYWNlIFdURiB7CiAgICAgICAgIGRlcmVmSWZOb3ROdWxsKHB0cik7CiAgICAgICAgIHJl dHVybiAqdGhpczsKICAgICB9CisjaWYgQ09NUElMRVJfU1VQUE9SVFMoQ1hYX1JWQUxVRV9SRUZF UkVOQ0VTKQorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlubGluZSBSZWZQdHI8VD4mIFJlZlB0 cjxUPjo6b3BlcmF0b3I9KFJlZlB0cjxUPiYmIG8pCisgICAgeworICAgICAgICBpZiAobV9wdHIg IT0gby5nZXQoKSkgeworICAgICAgICAgICAgZGVyZWZJZk5vdE51bGwobV9wdHIpOworICAgICAg ICAgICAgbV9wdHIgPSBvLmdldCgpOworICAgICAgICAgICAgby5tX3B0ciA9IDA7CisgICAgICAg IH0KKyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KIAorICAgIHRlbXBsYXRlPHR5cGVuYW1l IFQ+IHRlbXBsYXRlPHR5cGVuYW1lIFU+IGlubGluZSBSZWZQdHI8VD4mIFJlZlB0cjxUPjo6b3Bl cmF0b3I9KFJlZlB0cjxVPiYmIG8pCisgICAgeworICAgICAgICBpZiAobV9wdHIgIT0gby5nZXQo KSkgeworICAgICAgICAgICAgZGVyZWZJZk5vdE51bGwobV9wdHIpOworICAgICAgICAgICAgbV9w dHIgPSBvLmdldCgpOworICAgICAgICAgICAgby5tX3B0ciA9IDA7CisgICAgICAgIH0KKyAgICAg ICAgcmV0dXJuICp0aGlzOworICAgIH0KKyNlbmRpZgogICAgIHRlbXBsYXRlPGNsYXNzIFQ+IGlu bGluZSB2b2lkIFJlZlB0cjxUPjo6c3dhcChSZWZQdHI8VD4mIG8pCiAgICAgewogICAgICAgICBz dGQ6OnN3YXAobV9wdHIsIG8ubV9wdHIpOwo= 199236 2013-04-23 07:52:44 -0700 2013-04-23 08:28:40 -0700 patch v2 bug115033_v2 text/plain 2256 mikhail.pozdnyakov Y29tbWl0IGU4NDFkOGZkYWJmNjE4YTY1YzYzNGVmYzlhNTMyODg5YzNkYzgwNjQKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIEFwciAyMyAxNjo1MTo0NCAyMDEzICswMzAwCgogICAgYnVnMTE1MDMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCAwOTk5 ZWNmLi5kNjAxMWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTIzICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIEFkZCBt b3ZlIHNlbWFudGljcyB0byBSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50 IG9wZXJhdG9ycyB0byBSZWZQdHIgd2hlbgorICAgICAgICBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpLgorICAgICAgICBUaGlzIG9idmlhdGVzIHVubmVjZXNzYXJ5IHJl ZmZpbmcvdXJlZmZpbmcgd2hlbiBSZWZQdHIgaXMgY3JlYXRlZAorICAgICAgICBvciBhc3NpZ25l ZCBmcm9tIHJ2YWx1ZSByZWZlcmVuY2VzLgorCisgICAgICAgICogd3RmL1JlZlB0ci5oOgorICAg ICAgICAoUmVmUHRyKToKKyAgICAgICAgKFdURjo6UmVmUHRyOjpSZWZQdHIpOgorICAgICAgICAo V1RGOjpSZWZQdHI6Om9wZXJhdG9yPSk6CisKIDIwMTMtMDQtMjEgIEJlbmphbWluIFBvdWxhaW4g IDxiZW5qYW1pbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEltcHJvdmUgU3RyaW5nSW1wbCBjb2Rl IGRlbnNpdHkgZm9yIG9sZGVyIEFSTSBoYXJkd2FyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvUmVmUHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAppbmRleCAzMjJjYmQ2Li5hMTBj MWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9SZWZQdHIuaApAQCAtNDMsNiArNDMsMTEgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAg IEFMV0FZU19JTkxJTkUgUmVmUHRyKGNvbnN0IFJlZlB0ciYgbykgOiBtX3B0cihvLm1fcHRyKSB7 IHJlZklmTm90TnVsbChtX3B0cik7IH0KICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gUmVm UHRyKGNvbnN0IFJlZlB0cjxVPiYgbykgOiBtX3B0cihvLmdldCgpKSB7IHJlZklmTm90TnVsbCht X3B0cik7IH0KIAorI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9SVkFMVUVfUkVGRVJFTkNFUykK KyAgICAgICAgQUxXQVlTX0lOTElORSBSZWZQdHIoUmVmUHRyJiYgbykgOiBtX3B0cihvLnJlbGVh c2UoKS5sZWFrUmVmKCkpIHsgfQorICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHIo UmVmUHRyPFU+JiYgbykgOiBtX3B0cihvLnJlbGVhc2UoKS5sZWFrUmVmKCkpIHsgfQorI2VuZGlm CisKICAgICAgICAgLy8gU2VlIGNvbW1lbnRzIGluIFBhc3NSZWZQdHIuaCBmb3IgYW4gZXhwbGFu YXRpb24gb2Ygd2h5IHRoaXMgdGFrZXMgYSBjb25zdCByZWZlcmVuY2UuCiAgICAgICAgIHRlbXBs YXRlPHR5cGVuYW1lIFU+IFJlZlB0cihjb25zdCBQYXNzUmVmUHRyPFU+Jik7CiAKQEAgLTc1LDYg KzgwLDExIEBAIG5hbWVzcGFjZSBXVEYgewogI2lmICFDT01QSUxFUl9TVVBQT1JUUyhDWFhfTlVM TFBUUikKICAgICAgICAgUmVmUHRyJiBvcGVyYXRvcj0oc3RkOjpudWxscHRyX3QpIHsgY2xlYXIo KTsgcmV0dXJuICp0aGlzOyB9CiAjZW5kaWYKKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfUlZB TFVFX1JFRkVSRU5DRVMpCisgICAgICAgIFJlZlB0ciYgb3BlcmF0b3I9KFJlZlB0ciYmIG8pIHsg bV9wdHIgPSBvLnJlbGVhc2UoKTsgfQorICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQ dHImIG9wZXJhdG9yPShSZWZQdHI8VT4mJiBvKSB7IG1fcHRyID0gby5yZWxlYXNlKCk7IH0KKyNl bmRpZgorCiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0ciYgb3BlcmF0b3I9KGNv bnN0IFJlZlB0cjxVPiYpOwogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHImIG9w ZXJhdG9yPShjb25zdCBQYXNzUmVmUHRyPFU+Jik7CiAK 199244 2013-04-23 08:28:40 -0700 2013-04-24 04:38:19 -0700 patch v3 bug115033_v3 text/plain 2970 mikhail.pozdnyakov Y29tbWl0IDI0OTE1ZDFjYjYwNzdhMzdlMTVkOGE5ODM3ZmMwZjZhYWQ5OTVkYzIKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIEFwciAyMyAxNjo1MTo0NCAyMDEzICswMzAwCgogICAgYnVnMTE1MDMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCAwOTk5 ZWNmLi5kNjAxMWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTIzICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIEFkZCBt b3ZlIHNlbWFudGljcyB0byBSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50 IG9wZXJhdG9ycyB0byBSZWZQdHIgd2hlbgorICAgICAgICBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpLgorICAgICAgICBUaGlzIG9idmlhdGVzIHVubmVjZXNzYXJ5IHJl ZmZpbmcvdXJlZmZpbmcgd2hlbiBSZWZQdHIgaXMgY3JlYXRlZAorICAgICAgICBvciBhc3NpZ25l ZCBmcm9tIHJ2YWx1ZSByZWZlcmVuY2VzLgorCisgICAgICAgICogd3RmL1JlZlB0ci5oOgorICAg ICAgICAoUmVmUHRyKToKKyAgICAgICAgKFdURjo6UmVmUHRyOjpSZWZQdHIpOgorICAgICAgICAo V1RGOjpSZWZQdHI6Om9wZXJhdG9yPSk6CisKIDIwMTMtMDQtMjEgIEJlbmphbWluIFBvdWxhaW4g IDxiZW5qYW1pbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEltcHJvdmUgU3RyaW5nSW1wbCBjb2Rl IGRlbnNpdHkgZm9yIG9sZGVyIEFSTSBoYXJkd2FyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvUmVmUHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAppbmRleCAzMjJjYmQ2Li40M2I0 YzNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9SZWZQdHIuaApAQCAtNDMsNiArNDMsMTEgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAg IEFMV0FZU19JTkxJTkUgUmVmUHRyKGNvbnN0IFJlZlB0ciYgbykgOiBtX3B0cihvLm1fcHRyKSB7 IHJlZklmTm90TnVsbChtX3B0cik7IH0KICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gUmVm UHRyKGNvbnN0IFJlZlB0cjxVPiYgbykgOiBtX3B0cihvLmdldCgpKSB7IHJlZklmTm90TnVsbCht X3B0cik7IH0KIAorI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9SVkFMVUVfUkVGRVJFTkNFUykK KyAgICAgICAgQUxXQVlTX0lOTElORSBSZWZQdHIoUmVmUHRyJiYgbykgOiBtX3B0cihvLnJlbGVh c2UoKS5sZWFrUmVmKCkpIHsgfQorICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHIo UmVmUHRyPFU+JiYgbykgOiBtX3B0cihvLnJlbGVhc2UoKS5sZWFrUmVmKCkpIHsgfQorI2VuZGlm CisKICAgICAgICAgLy8gU2VlIGNvbW1lbnRzIGluIFBhc3NSZWZQdHIuaCBmb3IgYW4gZXhwbGFu YXRpb24gb2Ygd2h5IHRoaXMgdGFrZXMgYSBjb25zdCByZWZlcmVuY2UuCiAgICAgICAgIHRlbXBs YXRlPHR5cGVuYW1lIFU+IFJlZlB0cihjb25zdCBQYXNzUmVmUHRyPFU+Jik7CiAKQEAgLTc3LDcg KzgyLDEwIEBAIG5hbWVzcGFjZSBXVEYgewogI2VuZGlmCiAgICAgICAgIHRlbXBsYXRlPHR5cGVu YW1lIFU+IFJlZlB0ciYgb3BlcmF0b3I9KGNvbnN0IFJlZlB0cjxVPiYpOwogICAgICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHImIG9wZXJhdG9yPShjb25zdCBQYXNzUmVmUHRyPFU+Jik7 Ci0KKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfUlZBTFVFX1JFRkVSRU5DRVMpCisgICAgICAg IFJlZlB0ciYgb3BlcmF0b3I9KFJlZlB0ciYmKTsKKyAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUg VT4gUmVmUHRyJiBvcGVyYXRvcj0oUmVmUHRyPFU+JiYpOworI2VuZGlmCiAgICAgICAgIHZvaWQg c3dhcChSZWZQdHImKTsKIAogICAgICAgICBzdGF0aWMgVCogaGFzaFRhYmxlRGVsZXRlZFZhbHVl KCkgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUKj4oLTEpOyB9CkBAIC0xNDIsNyArMTUwLDI1 IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBkZXJlZklmTm90TnVsbChwdHIpOwogICAgICAg ICByZXR1cm4gKnRoaXM7CiAgICAgfQorI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9SVkFMVUVf UkVGRVJFTkNFUykKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgUmVmUHRyPFQ+JiBS ZWZQdHI8VD46Om9wZXJhdG9yPShSZWZQdHI8VD4mJiBvKQorICAgIHsKKyAgICAgICAgaWYgKG1f cHRyICE9IG8uZ2V0KCkpIHsKKyAgICAgICAgICAgIGRlcmVmSWZOb3ROdWxsKG1fcHRyKTsKKyAg ICAgICAgICAgIG1fcHRyID0gby5yZWxlYXNlKCkubGVha1JlZigpOworICAgICAgICB9CisgICAg ICAgIHJldHVybiAqdGhpczsKKyAgICB9CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB0ZW1w bGF0ZTx0eXBlbmFtZSBVPiBpbmxpbmUgUmVmUHRyPFQ+JiBSZWZQdHI8VD46Om9wZXJhdG9yPShS ZWZQdHI8VT4mJiBvKQorICAgIHsKKyAgICAgICAgaWYgKG1fcHRyICE9IG8uZ2V0KCkpIHsKKyAg ICAgICAgICAgIGRlcmVmSWZOb3ROdWxsKG1fcHRyKTsKKyAgICAgICAgICAgIG1fcHRyID0gby5y ZWxlYXNlKCkubGVha1JlZigpOworICAgICAgICB9CisgICAgICAgIHJldHVybiAqdGhpczsKKyAg ICB9CisjZW5kaWYKICAgICB0ZW1wbGF0ZTxjbGFzcyBUPiBpbmxpbmUgdm9pZCBSZWZQdHI8VD46 OnN3YXAoUmVmUHRyPFQ+JiBvKQogICAgIHsKICAgICAgICAgc3RkOjpzd2FwKG1fcHRyLCBvLm1f cHRyKTsK 199413 2013-04-24 04:38:19 -0700 2013-04-25 12:11:26 -0700 patch v4 bug115033_v4 text/plain 2912 mikhail.pozdnyakov Y29tbWl0IDk5MjViYzg2YzllMmYzN2ZjOWUwNDA2ZjJmYjQwMGVkOGRkMDFmY2MKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIEFwciAyMyAxNjo1MTo0NCAyMDEzICswMzAwCgogICAgYnVnMTE1MDMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCAwOTk5 ZWNmLi5kNjAxMWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTIzICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIEFkZCBt b3ZlIHNlbWFudGljcyB0byBSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50 IG9wZXJhdG9ycyB0byBSZWZQdHIgd2hlbgorICAgICAgICBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpLgorICAgICAgICBUaGlzIG9idmlhdGVzIHVubmVjZXNzYXJ5IHJl ZmZpbmcvdXJlZmZpbmcgd2hlbiBSZWZQdHIgaXMgY3JlYXRlZAorICAgICAgICBvciBhc3NpZ25l ZCBmcm9tIHJ2YWx1ZSByZWZlcmVuY2VzLgorCisgICAgICAgICogd3RmL1JlZlB0ci5oOgorICAg ICAgICAoUmVmUHRyKToKKyAgICAgICAgKFdURjo6UmVmUHRyOjpSZWZQdHIpOgorICAgICAgICAo V1RGOjpSZWZQdHI6Om9wZXJhdG9yPSk6CisKIDIwMTMtMDQtMjEgIEJlbmphbWluIFBvdWxhaW4g IDxiZW5qYW1pbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEltcHJvdmUgU3RyaW5nSW1wbCBjb2Rl IGRlbnNpdHkgZm9yIG9sZGVyIEFSTSBoYXJkd2FyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvUmVmUHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAppbmRleCAzMjJjYmQ2Li44ZmRh YTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9SZWZQdHIuaAorKysgYi9Tb3VyY2UvV1RG L3d0Zi9SZWZQdHIuaApAQCAtNDMsNiArNDMsMTEgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAg IEFMV0FZU19JTkxJTkUgUmVmUHRyKGNvbnN0IFJlZlB0ciYgbykgOiBtX3B0cihvLm1fcHRyKSB7 IHJlZklmTm90TnVsbChtX3B0cik7IH0KICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gUmVm UHRyKGNvbnN0IFJlZlB0cjxVPiYgbykgOiBtX3B0cihvLmdldCgpKSB7IHJlZklmTm90TnVsbCht X3B0cik7IH0KIAorI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9SVkFMVUVfUkVGRVJFTkNFUykK KyAgICAgICAgQUxXQVlTX0lOTElORSBSZWZQdHIoUmVmUHRyJiYgbykgOiBtX3B0cihvLnJlbGVh c2UoKS5sZWFrUmVmKCkpIHsgfQorICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHIo UmVmUHRyPFU+JiYgbykgOiBtX3B0cihvLnJlbGVhc2UoKS5sZWFrUmVmKCkpIHsgfQorI2VuZGlm CisKICAgICAgICAgLy8gU2VlIGNvbW1lbnRzIGluIFBhc3NSZWZQdHIuaCBmb3IgYW4gZXhwbGFu YXRpb24gb2Ygd2h5IHRoaXMgdGFrZXMgYSBjb25zdCByZWZlcmVuY2UuCiAgICAgICAgIHRlbXBs YXRlPHR5cGVuYW1lIFU+IFJlZlB0cihjb25zdCBQYXNzUmVmUHRyPFU+Jik7CiAKQEAgLTc3LDcg KzgyLDEwIEBAIG5hbWVzcGFjZSBXVEYgewogI2VuZGlmCiAgICAgICAgIHRlbXBsYXRlPHR5cGVu YW1lIFU+IFJlZlB0ciYgb3BlcmF0b3I9KGNvbnN0IFJlZlB0cjxVPiYpOwogICAgICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHImIG9wZXJhdG9yPShjb25zdCBQYXNzUmVmUHRyPFU+Jik7 Ci0KKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfUlZBTFVFX1JFRkVSRU5DRVMpCisgICAgICAg IFJlZlB0ciYgb3BlcmF0b3I9KFJlZlB0ciYmKTsKKyAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUg VT4gUmVmUHRyJiBvcGVyYXRvcj0oUmVmUHRyPFU+JiYpOworI2VuZGlmCiAgICAgICAgIHZvaWQg c3dhcChSZWZQdHImKTsKIAogICAgICAgICBzdGF0aWMgVCogaGFzaFRhYmxlRGVsZXRlZFZhbHVl KCkgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUKj4oLTEpOyB9CkBAIC0xNDIsNyArMTUwLDIz IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBkZXJlZklmTm90TnVsbChwdHIpOwogICAgICAg ICByZXR1cm4gKnRoaXM7CiAgICAgfQorI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9SVkFMVUVf UkVGRVJFTkNFUykKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgUmVmUHRyPFQ+JiBS ZWZQdHI8VD46Om9wZXJhdG9yPShSZWZQdHI8VD4mJiBvKQorICAgIHsKKyAgICAgICAgVCogcHRy ID0gbV9wdHI7CisgICAgICAgIG1fcHRyID0gby5yZWxlYXNlKCkubGVha1JlZigpOworICAgICAg ICBkZXJlZklmTm90TnVsbChwdHIpOworICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgfQogCisg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gdGVtcGxhdGU8dHlwZW5hbWUgVT4gaW5saW5lIFJlZlB0 cjxUPiYgUmVmUHRyPFQ+OjpvcGVyYXRvcj0oUmVmUHRyPFU+JiYgbykKKyAgICB7CisgICAgICAg IFQqIHB0ciA9IG1fcHRyOworICAgICAgICBtX3B0ciA9IG8ucmVsZWFzZSgpLmxlYWtSZWYoKTsK KyAgICAgICAgZGVyZWZJZk5vdE51bGwocHRyKTsKKyAgICAgICAgcmV0dXJuICp0aGlzOworICAg IH0KKyNlbmRpZgogICAgIHRlbXBsYXRlPGNsYXNzIFQ+IGlubGluZSB2b2lkIFJlZlB0cjxUPjo6 c3dhcChSZWZQdHI8VD4mIG8pCiAgICAgewogICAgICAgICBzdGQ6OnN3YXAobV9wdHIsIG8ubV9w dHIpOwo= 199733 2013-04-25 12:11:26 -0700 2013-04-26 02:09:44 -0700 patch v5 bug115033_v5 text/plain 3001 mikhail.pozdnyakov Y29tbWl0IDFmM2E2MGYyYWMzM2EwM2E5OTVkNjJhZGIxMTQyODUzNzg4NTY3ZTEKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIEFwciAyMyAxNjo1MTo0NCAyMDEzICswMzAwCgogICAgYnVnMTE1MDMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCBlNGY2 OGI0Li5jYjIzZDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTIzICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIEFkZCBt b3ZlIHNlbWFudGljcyB0byBSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50 IG9wZXJhdG9ycyB0byBSZWZQdHIgd2hlbgorICAgICAgICBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpLgorICAgICAgICBUaGlzIG9idmlhdGVzIHVubmVjZXNzYXJ5IHJl ZmZpbmcvdXJlZmZpbmcgd2hlbiBSZWZQdHIgaXMgY3JlYXRlZAorICAgICAgICBvciBhc3NpZ25l ZCBmcm9tIHJ2YWx1ZSByZWZlcmVuY2VzLgorCisgICAgICAgICogd3RmL1JlZlB0ci5oOgorICAg ICAgICAoUmVmUHRyKToKKyAgICAgICAgKFdURjo6UmVmUHRyOjpSZWZQdHIpOgorICAgICAgICAo V1RGOjpSZWZQdHI6Om9wZXJhdG9yPSk6CisKIDIwMTMtMDQtMjMgIEdlb2ZmcmV5IEdhcmVuICA8 Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBGaWxsZWQgb3V0IG1vcmUgY2FzZXMgb2YgYnJh bmNoIGZvbGRpbmcgaW4gYnl0ZWNvZGUgd2hlbiBlbWl0dGluZyBleHByZXNzaW9ucyBpbnRvIGEg YnJhbmNoaW5nIGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1JlZlB0ci5oIGIv U291cmNlL1dURi93dGYvUmVmUHRyLmgKaW5kZXggMzIyY2JkNi4uNjlhZTE0MSAxMDA2NDQKLS0t IGEvU291cmNlL1dURi93dGYvUmVmUHRyLmgKKysrIGIvU291cmNlL1dURi93dGYvUmVmUHRyLmgK QEAgLTQzLDYgKzQzLDExIEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBBTFdBWVNfSU5MSU5F IFJlZlB0cihjb25zdCBSZWZQdHImIG8pIDogbV9wdHIoby5tX3B0cikgeyByZWZJZk5vdE51bGwo bV9wdHIpOyB9CiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0cihjb25zdCBSZWZQ dHI8VT4mIG8pIDogbV9wdHIoby5nZXQoKSkgeyByZWZJZk5vdE51bGwobV9wdHIpOyB9CiAKKyNp ZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfUlZBTFVFX1JFRkVSRU5DRVMpCisgICAgICAgIEFMV0FZ U19JTkxJTkUgUmVmUHRyKFJlZlB0ciYmIG8pIDogbV9wdHIoby5yZWxlYXNlKCkubGVha1JlZigp KSB7IH0KKyAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gUmVmUHRyKFJlZlB0cjxVPiYmIG8p IDogbV9wdHIoby5yZWxlYXNlKCkubGVha1JlZigpKSB7IH0KKyNlbmRpZgorCiAgICAgICAgIC8v IFNlZSBjb21tZW50cyBpbiBQYXNzUmVmUHRyLmggZm9yIGFuIGV4cGxhbmF0aW9uIG9mIHdoeSB0 aGlzIHRha2VzIGEgY29uc3QgcmVmZXJlbmNlLgogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBV PiBSZWZQdHIoY29uc3QgUGFzc1JlZlB0cjxVPiYpOwogCkBAIC03Nyw3ICs4MiwxMCBAQCBuYW1l c3BhY2UgV1RGIHsKICNlbmRpZgogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHIm IG9wZXJhdG9yPShjb25zdCBSZWZQdHI8VT4mKTsKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUg VT4gUmVmUHRyJiBvcGVyYXRvcj0oY29uc3QgUGFzc1JlZlB0cjxVPiYpOwotCisjaWYgQ09NUElM RVJfU1VQUE9SVFMoQ1hYX1JWQUxVRV9SRUZFUkVOQ0VTKQorICAgICAgICBSZWZQdHImIG9wZXJh dG9yPShSZWZQdHImJik7CisgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0ciYgb3Bl cmF0b3I9KFJlZlB0cjxVPiYmKTsKKyNlbmRpZgogICAgICAgICB2b2lkIHN3YXAoUmVmUHRyJik7 CiAKICAgICAgICAgc3RhdGljIFQqIGhhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpIHsgcmV0dXJuIHJl aW50ZXJwcmV0X2Nhc3Q8VCo+KC0xKTsgfQpAQCAtMTQyLDcgKzE1MCwyNSBAQCBuYW1lc3BhY2Ug V1RGIHsKICAgICAgICAgZGVyZWZJZk5vdE51bGwocHRyKTsKICAgICAgICAgcmV0dXJuICp0aGlz OwogICAgIH0KKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfUlZBTFVFX1JFRkVSRU5DRVMpCisg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFJlZlB0cjxUPiYgUmVmUHRyPFQ+OjpvcGVy YXRvcj0oUmVmUHRyPFQ+JiYgbykKKyAgICB7CisgICAgICAgIGlmICh0aGlzICE9ICZvKSB7Cisg ICAgICAgICAgICBkZXJlZklmTm90TnVsbChtX3B0cik7CisgICAgICAgICAgICBtX3B0ciA9IG8u cmVsZWFzZSgpLmxlYWtSZWYoKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gKnRoaXM7Cisg ICAgfQogCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gdGVtcGxhdGU8dHlwZW5hbWUgVT4gaW5s aW5lIFJlZlB0cjxUPiYgUmVmUHRyPFQ+OjpvcGVyYXRvcj0oUmVmUHRyPFU+JiYgbykKKyAgICB7 CisgICAgICAgIGlmICh0aGlzICE9ICZvKSB7CisgICAgICAgICAgICBkZXJlZklmTm90TnVsbCht X3B0cik7CisgICAgICAgICAgICBtX3B0ciA9IG8ucmVsZWFzZSgpLmxlYWtSZWYoKTsKKyAgICAg ICAgfQorICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgfQorI2VuZGlmCiAgICAgdGVtcGxhdGU8 Y2xhc3MgVD4gaW5saW5lIHZvaWQgUmVmUHRyPFQ+Ojpzd2FwKFJlZlB0cjxUPiYgbykKICAgICB7 CiAgICAgICAgIHN0ZDo6c3dhcChtX3B0ciwgby5tX3B0cik7Cg== 199804 2013-04-26 02:09:44 -0700 2013-04-26 07:36:27 -0700 patch v6 bug115033_v6 text/plain 3004 mikhail.pozdnyakov Y29tbWl0IGU4YzkxMDQ2MjkzNjI2ODViYTU4ZGZiMGQwMGJhZjE1NzJjZDAxZDQKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIEFwciAyMyAxNjo1MTo0NCAyMDEzICswMzAwCgogICAgYnVnMTE1MDMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCBlNGY2 OGI0Li5jYjIzZDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTIzICBNaWtoYWlsIFBv emRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIEFkZCBt b3ZlIHNlbWFudGljcyB0byBSZWZQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50 IG9wZXJhdG9ycyB0byBSZWZQdHIgd2hlbgorICAgICAgICBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpLgorICAgICAgICBUaGlzIG9idmlhdGVzIHVubmVjZXNzYXJ5IHJl ZmZpbmcvdXJlZmZpbmcgd2hlbiBSZWZQdHIgaXMgY3JlYXRlZAorICAgICAgICBvciBhc3NpZ25l ZCBmcm9tIHJ2YWx1ZSByZWZlcmVuY2VzLgorCisgICAgICAgICogd3RmL1JlZlB0ci5oOgorICAg ICAgICAoUmVmUHRyKToKKyAgICAgICAgKFdURjo6UmVmUHRyOjpSZWZQdHIpOgorICAgICAgICAo V1RGOjpSZWZQdHI6Om9wZXJhdG9yPSk6CisKIDIwMTMtMDQtMjMgIEdlb2ZmcmV5IEdhcmVuICA8 Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBGaWxsZWQgb3V0IG1vcmUgY2FzZXMgb2YgYnJh bmNoIGZvbGRpbmcgaW4gYnl0ZWNvZGUgd2hlbiBlbWl0dGluZyBleHByZXNzaW9ucyBpbnRvIGEg YnJhbmNoaW5nIGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1JlZlB0ci5oIGIv U291cmNlL1dURi93dGYvUmVmUHRyLmgKaW5kZXggMzIyY2JkNi4uNDA0MDI5ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dURi93dGYvUmVmUHRyLmgKKysrIGIvU291cmNlL1dURi93dGYvUmVmUHRyLmgK QEAgLTI0LDYgKzI0LDcgQEAKICNkZWZpbmUgV1RGX1JlZlB0cl9oCiAKICNpbmNsdWRlIDxhbGdv cml0aG0+CisjaW5jbHVkZSA8dXRpbGl0eT4KICNpbmNsdWRlIDx3dGYvRmFzdEFsbG9jQmFzZS5o PgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKQEAgLTQzLDYgKzQ0LDExIEBAIG5hbWVz cGFjZSBXVEYgewogICAgICAgICBBTFdBWVNfSU5MSU5FIFJlZlB0cihjb25zdCBSZWZQdHImIG8p IDogbV9wdHIoby5tX3B0cikgeyByZWZJZk5vdE51bGwobV9wdHIpOyB9CiAgICAgICAgIHRlbXBs YXRlPHR5cGVuYW1lIFU+IFJlZlB0cihjb25zdCBSZWZQdHI8VT4mIG8pIDogbV9wdHIoby5nZXQo KSkgeyByZWZJZk5vdE51bGwobV9wdHIpOyB9CiAKKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhf UlZBTFVFX1JFRkVSRU5DRVMpCisgICAgICAgIEFMV0FZU19JTkxJTkUgUmVmUHRyKFJlZlB0ciYm IG8pIDogbV9wdHIoby5yZWxlYXNlKCkubGVha1JlZigpKSB7IH0KKyAgICAgICAgdGVtcGxhdGU8 dHlwZW5hbWUgVT4gUmVmUHRyKFJlZlB0cjxVPiYmIG8pIDogbV9wdHIoby5yZWxlYXNlKCkubGVh a1JlZigpKSB7IH0KKyNlbmRpZgorCiAgICAgICAgIC8vIFNlZSBjb21tZW50cyBpbiBQYXNzUmVm UHRyLmggZm9yIGFuIGV4cGxhbmF0aW9uIG9mIHdoeSB0aGlzIHRha2VzIGEgY29uc3QgcmVmZXJl bmNlLgogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHIoY29uc3QgUGFzc1JlZlB0 cjxVPiYpOwogCkBAIC03Nyw3ICs4MywxMCBAQCBuYW1lc3BhY2UgV1RGIHsKICNlbmRpZgogICAg ICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBSZWZQdHImIG9wZXJhdG9yPShjb25zdCBSZWZQdHI8 VT4mKTsKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gUmVmUHRyJiBvcGVyYXRvcj0oY29u c3QgUGFzc1JlZlB0cjxVPiYpOwotCisjaWYgQ09NUElMRVJfU1VQUE9SVFMoQ1hYX1JWQUxVRV9S RUZFUkVOQ0VTKQorICAgICAgICBSZWZQdHImIG9wZXJhdG9yPShSZWZQdHImJik7CisgICAgICAg IHRlbXBsYXRlPHR5cGVuYW1lIFU+IFJlZlB0ciYgb3BlcmF0b3I9KFJlZlB0cjxVPiYmKTsKKyNl bmRpZgogICAgICAgICB2b2lkIHN3YXAoUmVmUHRyJik7CiAKICAgICAgICAgc3RhdGljIFQqIGhh c2hUYWJsZURlbGV0ZWRWYWx1ZSgpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VCo+KC0xKTsg fQpAQCAtMTQyLDcgKzE1MSwxOSBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgZGVyZWZJZk5v dE51bGwocHRyKTsKICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgIH0KKyNpZiBDT01QSUxFUl9T VVBQT1JUUyhDWFhfUlZBTFVFX1JFRkVSRU5DRVMpCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4g aW5saW5lIFJlZlB0cjxUPiYgUmVmUHRyPFQ+OjpvcGVyYXRvcj0oUmVmUHRyPFQ+JiYgbykKKyAg ICB7CisgICAgICAgIFJlZlB0cjxUPihzdGQ6Om1vdmUobykpLnN3YXAoKnRoaXMpOworICAgICAg ICByZXR1cm4gKnRoaXM7CisgICAgfQogCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gdGVtcGxh dGU8dHlwZW5hbWUgVT4gaW5saW5lIFJlZlB0cjxUPiYgUmVmUHRyPFQ+OjpvcGVyYXRvcj0oUmVm UHRyPFU+JiYgbykKKyAgICB7CisgICAgICAgIFJlZlB0cjxUPihzdGQ6Om1vdmUobykpLnN3YXAo KnRoaXMpOworICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgfQorI2VuZGlmCiAgICAgdGVtcGxh dGU8Y2xhc3MgVD4gaW5saW5lIHZvaWQgUmVmUHRyPFQ+Ojpzd2FwKFJlZlB0cjxUPiYgbykKICAg ICB7CiAgICAgICAgIHN0ZDo6c3dhcChtX3B0ciwgby5tX3B0cik7Cg==