87847 2012-05-30 06:33:28 -0700 [Qt] Make conversion from QString to WTF::String (and back again) ~free 2012-06-01 05:26:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vestbo vestbo barraclough cmarcelo darin hausmann zalan oldest_to_newest 637147 0 vestbo 2012-05-30 06:33:28 -0700 [Qt] Make conversion from QString to WTF::String (and back again) ~free 637152 1 144794 vestbo 2012-05-30 06:35:39 -0700 Created attachment 144794 Patch 637163 2 144800 vestbo 2012-05-30 06:54:38 -0700 Created attachment 144800 Patch 637174 3 144803 vestbo 2012-05-30 06:59:59 -0700 Created attachment 144803 Patch 637194 4 144808 vestbo 2012-05-30 07:24:55 -0700 Created attachment 144808 Patch 637201 5 144808 hausmann 2012-05-30 07:37:41 -0700 Comment on attachment 144808 Patch I think this looks good from a Qt perspective. I think we should run the idea also past some other String folks, to see if they have any concerns with doing this Qt specific optimization. 637203 6 144808 zalan 2012-05-30 07:39:57 -0700 Comment on attachment 144808 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144808&action=review > w/Source/WTF/wtf/text/StringImpl.h:406 > + QStringData* qStringData() { return bufferOwnership() == BufferAdoptedQString ? m_qStringData : 0; } shouldnt m_qStringData be NULL anyway when it's not adoptedQString? 637208 7 144808 hausmann 2012-05-30 07:42:46 -0700 Comment on attachment 144808 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144808&action=review >> w/Source/WTF/wtf/text/StringImpl.h:406 >> + QStringData* qStringData() { return bufferOwnership() == BufferAdoptedQString ? m_qStringData : 0; } > > shouldnt m_qStringData be NULL anyway when it's not adoptedQString? It could have a different value since it's part of a union. 637213 8 zalan 2012-05-30 07:49:15 -0700 (In reply to comment #7) > (From update of attachment 144808 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=144808&action=review > > >> w/Source/WTF/wtf/text/StringImpl.h:406 > >> + QStringData* qStringData() { return bufferOwnership() == BufferAdoptedQString ? m_qStringData : 0; } > > > > shouldnt m_qStringData be NULL anyway when it's not adoptedQString? > > It could have a different value since it's part of a union. oh right. that was cut off of the review context. should have looked at the original code. 637214 9 vestbo 2012-05-30 07:50:02 -0700 (In reply to comment #5) > (From update of attachment 144808 [details]) > I think this looks good from a Qt perspective. I think we should run the idea also past some other String folks, to see if they have any concerns with doing this Qt specific optimization. Come to think of it, if more ports would like this we can always make the ownership BufferAdoptedPlatformString instead. 637286 10 144808 webkit-ews 2012-05-30 09:03:01 -0700 Comment on attachment 144808 Patch Attachment 144808 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12842890 638400 11 145089 vestbo 2012-05-31 07:40:12 -0700 Created attachment 145089 Patch Rebased to ToT, HAVE(QT5) landed in r119098 638402 12 vestbo 2012-05-31 07:41:45 -0700 Darin, Gavin, what do you guys think? 638764 13 145089 barraclough 2012-05-31 15:35:47 -0700 Comment on attachment 145089 Patch This seems fine to me. We've discussed refactoring the various backing buffers behind an extra layer of abstraction at some point, with a virtual interface so we can move knowledge of the set of supported types out of backing buffers out of StringImpl. But if we do want to make a change like that, we could easily make QStringData one of the types of supported buffers. 639216 14 vestbo 2012-06-01 05:26:04 -0700 Committed r119217: <http://trac.webkit.org/changeset/119217> 144794 2012-05-30 06:35:39 -0700 2012-05-30 06:54:30 -0700 Patch bug-87847-20120530153537.patch text/plain 7002 vestbo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzYzCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyB3L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzNjY5ZDZiMmZlNDkwYTA2YzRjM2Mz YTQ4NzM1YTI5NWQyODBiZTkuLmNlYTI0MDBjNTdiODNhM2U5ODg4MDY0ZDJiMDg1OWQ1YjgzNjQ4 MzQgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyB3L1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDUtMzAgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBjb252ZXJzaW9u IGZyb20gUVN0cmluZyB0byBXVEY6OlN0cmluZyAoYW5kIGJhY2sgYWdhaW4pIH5mcmVlCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQ3CisKKyAg ICAgICAgSW5zdGVhZCBvZiBjb3B5aW5nIHRoZSBRU3RyaW5nIGRhdGEgd2hlbiBjb252ZXJ0aW5n IHRvIGEgV1RGOjpTdHJpbmcgd2UKKyAgICAgICAgbWFrZSB0aGUgV1RGOjpTdHJpbmcgYWRvcHQg dGhlIFFTdHJpbmcgZGF0YSBieSBpbnRyb2R1Y2luZyBhIG5ldyBidWZmZXIKKyAgICAgICAgb3du ZXJzaGlwIHR5cGUsIGFuZCBwb2ludGluZyB0aGUgaW50ZXJuYWwgV1RGOjpTdHJpbmdJbXBsIDE2 LWJpdCBkYXRhCisgICAgICAgIG1lbWJlciB0byB0aGUgc3RyaW5nIGRhdGEgbWFuYWdlZCBieSBR U3RyaW5nRGF0YS4KKworICAgICAgICBXZSBtYWtlIHN1cmUgdG8gcmVmZXJlbmNlIHRoZSBRU3Ry aW5nRGF0YSB3aGVuIGFkb3B0aW5nLCBzbyB0aGF0IHRoZQorICAgICAgICBkYXRhIHdpbGwgc3Rh eSBhbGl2ZSwgYW5kIHRoZW4gZGVyZWZlcmVuY2UgaXQgd2hlbiB0aGUgV1RGOjpTdHJpbmdJbXBs CisgICAgICAgIGlzIGRlbGV0ZWQsIHdoaWNoIHdpbGwgZnJlZSB0aGUgUVN0cmluZ0RhdGEgKGVp dGhlciBzdHJhaWdodCBhd2F5LCBpZgorICAgICAgICB3ZSdyZSB0aGUgb25seSBvbmUgaG9sZGlu ZyBhIHJlZmVyZW5jZSBzdGlsbCwgb3IgbGF0ZXIsIHdoZW4gdGhlIHJlZgorICAgICAgICBjb3Vu dCBnb2VzIHRvIDApLgorCisgICAgICAgIEluIHRoZSBjYXNlIG9mIGdvaW5nIGJhY2sgZnJvbSBh IFdURjo6U3RyaW5nIHRvIGEgUVN0cmluZyB3ZSBjYW4gY2hlYXQKKyAgICAgICAgYSBiaXQgKGF2 b2lkIGEgY29weSksIGlmIHdlIGtub3cgdGhhdCB0aGUgV1RGOjpTdHJpbmcgd2FzIGFkb3B0ZWQg ZnJvbQorICAgICAgICBhIFFTdHJpbmcsIHNpbmNlIGl0J3MgdGhlbiBqdXN0IGEgbWF0dGVyIG9m IGhhdmluZyB0aGUgUVN0cmluZyBhZG9wdAorICAgICAgICB0aGUgZXhpc3RpbmcgUVN0cmluZ0Rh dGEgKGp1c3QgbGlrZSBhIHJlZ3VsYXIgUVN0cmluZyBjb3B5KS4KKworICAgICAgICBJZiB0aGUg V1RGOjpTdHJpbmcgYnVmZmVyIGlzIG5vdCBvd25lZCBieSBRU3RyaW5nRGF0YSwgZWcgYSByZWd1 bGFyCisgICAgICAgIDgtYml0IG9yIDE2LWJpdCBzdHJpbmcvc3Vic3RyaW5nLCB3ZSBoYXZlIHRv IGZhbGwgYmFjayB0byBjb3B5aW5nLAorICAgICAgICBhcyBiZWZvcmUgKHRob3VnaCB0aGVyZSBh cmUgcG90ZW50aWFsIG9wdGltaXphdGlvbiB0cmlja3Mgd2UgY2FuCisgICAgICAgIGFwcGx5IGhl cmUgbGF0ZXIgb24pLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL3F0L1N0cmluZ1F0LmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJ bXBsLmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJbXBsLmg6CisKIDIwMTItMDUtMjcg IERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhbiBpbmNvcnJl Y3QgYXNzZXJ0aW9uIGluIFZlY3Rvcjo6cmVtb3ZlCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL3d0 Zi9xdC9TdHJpbmdRdC5jcHAgdy9Tb3VyY2UvV1RGL3d0Zi9xdC9TdHJpbmdRdC5jcHAKaW5kZXgg MTZkZDQzOWUzYmNmMWI4NWE2NmJiMWQ1MDk3MjI1NDUwNjM2NjhkYy4uYWYwNmJhZjQ0Njg2OGI0 YmE4YWQ1NzU4OGI0OTI0M2FhM2M4MDgyMyAxMDA2NDQKLS0tIGMvU291cmNlL1dURi93dGYvcXQv U3RyaW5nUXQuY3BwCisrKyB3L1NvdXJjZS9XVEYvd3RmL3F0L1N0cmluZ1F0LmNwcApAQCAtMzcs NyArMzcsNyBAQCBTdHJpbmc6OlN0cmluZyhjb25zdCBRU3RyaW5nJiBxc3RyKQogewogICAgIGlm IChxc3RyLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47Ci0gICAgbV9pbXBsID0gU3RyaW5nSW1w bDo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3RfcHRyPGNvbnN0IFVDaGFyKj4ocXN0ci5jb25zdERh dGEoKSksIHFzdHIubGVuZ3RoKCkpOworICAgIG1faW1wbCA9IFN0cmluZ0ltcGw6OmFkb3B0KGNv bnN0X2Nhc3Q8UVN0cmluZyY+KHFzdHIpLmRhdGFfcHRyKCkpOwogfQogCiBTdHJpbmc6OlN0cmlu Zyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCkBAIC00OSw2ICs0OSwxNyBAQCBTdHJpbmc6OlN0cmlu Zyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCiAKIFN0cmluZzo6b3BlcmF0b3IgUVN0cmluZygpIGNv bnN0CiB7CisgICAgaWYgKCFtX2ltcGwpCisgICAgICAgIHJldHVybiBRU3RyaW5nKCk7CisKKyAg ICBpZiAoUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhID0gbV9pbXBsLT5xU3RyaW5nRGF0YSgpKSB7 CisgICAgICAgIC8vIFRoZSBXVEYgc3RyaW5nIHdhcyBhZG9wdGVkIGZyb20gYSBRU3RyaW5nIGF0 IHNvbWUgcG9pbnQsIHNvIHdlCisgICAgICAgIC8vIGNhbiBqdXN0IGFkb3B0IHRoZSBRU3RyaW5n RGF0YSBsaWtlIGEgcmVndWxhciBRU3RyaW5nIGNvcHkKKyAgICAgICAgcVN0cmluZ0RhdGEtPnJl Zi5yZWYoKTsKKyAgICAgICAgUVN0cmluZ0RhdGFQdHIgcVN0cmluZ0RhdGFQb2ludGVyID0geyBx U3RyaW5nRGF0YSB9OworICAgICAgICByZXR1cm4gUVN0cmluZyhxU3RyaW5nRGF0YVBvaW50ZXIp OworICAgIH0KKwogICAgIHJldHVybiBRU3RyaW5nKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgUUNo YXIqPihjaGFyYWN0ZXJzKCkpLCBsZW5ndGgoKSk7CiB9CiAKZGlmZiAtLWdpdCBjL1NvdXJjZS9X VEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAgdy9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0lt cGwuY3BwCmluZGV4IDM3MmRiMTc2NjZkYWMwZjA2MGI2MDkwZjA5ZjU5NWMzZWVmN2Y0Y2EuLjk4 YjY5MmUyNjk0NTA3NTIzMmFhYzgzODBmODFiM2I3YTZhMzBhMTMgMTAwNjQ0Ci0tLSBjL1NvdXJj ZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAKKysrIHcvU291cmNlL1dURi93dGYvdGV4dC9T dHJpbmdJbXBsLmNwcApAQCAtNjksNiArNjksMTMgQEAgU3RyaW5nSW1wbDo6flN0cmluZ0ltcGwo KQogICAgICAgICBmYXN0RnJlZShjb25zdF9jYXN0PExDaGFyKj4obV9kYXRhOCkpOwogICAgICAg ICByZXR1cm47CiAgICAgfQorI2lmIFBMQVRGT1JNKFFUKQorICAgIGlmIChvd25lcnNoaXAgPT0g QnVmZmVyQWRvcHRlZFFTdHJpbmcpIHsKKyAgICAgICAgaWYgKCFtX3FTdHJpbmdEYXRhLT5yZWYu ZGVyZWYoKSkKKyAgICAgICAgICAgIFFTdHJpbmdEYXRhOjpkZWFsbG9jYXRlKG1fcVN0cmluZ0Rh dGEpOworICAgICAgICByZXR1cm47CisgICAgfQorI2VuZGlmCiAKICAgICBBU1NFUlQob3duZXJz aGlwID09IEJ1ZmZlclN1YnN0cmluZyk7CiAgICAgQVNTRVJUKG1fc3Vic3RyaW5nQnVmZmVyKTsK QEAgLTE2NDQsNiArMTY1MSwxNiBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6 OmFkb3B0KFN0cmluZ0J1ZmZlcjxVQ2hhcj4mIGJ1ZmZlcikKICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IFN0cmluZ0ltcGwoYnVmZmVyLnJlbGVhc2UoKSwgbGVuZ3RoKSk7CiB9CiAKKyNpZiBQTEFU Rk9STShRVCkKK1Bhc3NSZWZQdHI8U3RyaW5nSW1wbD4gU3RyaW5nSW1wbDo6YWRvcHQoUVN0cmlu Z0RhdGEqIHFTdHJpbmdEYXRhKQoreworICAgIGlmICghcVN0cmluZ0RhdGEgfHwgIXFTdHJpbmdE YXRhLT5zaXplKQorICAgICAgICByZXR1cm4gZW1wdHkoKTsKKworICAgIHJldHVybiBhZG9wdFJl ZihuZXcgU3RyaW5nSW1wbChxU3RyaW5nRGF0YSwgQ29uc3RydWN0QWRvcHRlZFFTdHJpbmcpKTsK K30KKyNlbmRpZgorCiBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6OmNyZWF0ZVdp dGhUZXJtaW5hdGluZ051bGxDaGFyYWN0ZXIoY29uc3QgU3RyaW5nSW1wbCYgc3RyaW5nKQogewog ICAgIC8vIFVzZSBjcmVhdGVVbmluaXRpYWxpemVkIGluc3RlYWQgb2YgJ25ldyBTdHJpbmdJbXBs JyBzbyB0aGF0IHRoZSBzdHJpbmcgYW5kIGl0cyBidWZmZXIKZGlmZiAtLWdpdCBjL1NvdXJjZS9X VEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBs LmgKaW5kZXggYjgwNzNiMzA5NzVjMGFlODBmMjkyMTQ0N2VhOGUwNmYzYmYyYzEzNi4uODBlNTA1 ZDI5OTZkNzNlNGE0M2QzODQwYTRhMmU3MmYwYzNiZTdmZSAxMDA2NDQKLS0tIGMvU291cmNlL1dU Ri93dGYvdGV4dC9TdHJpbmdJbXBsLmgKKysrIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJ bXBsLmgKQEAgLTMxLDYgKzMxLDEwIEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1 ZGUgPHd0Zi91bmljb2RlL1VuaWNvZGUuaD4KIAorI2lmIFBMQVRGT1JNKFFUKQorI2luY2x1ZGUg PFFTdHJpbmc+CisjZW5kaWYKKwogI2lmIFVTRShDRikKIHR5cGVkZWYgY29uc3Qgc3RydWN0IF9f Q0ZTdHJpbmcgKiBDRlN0cmluZ1JlZjsKICNlbmRpZgpAQCAtODIsNiArODYsOSBAQCBwcml2YXRl OgogICAgICAgICBCdWZmZXJJbnRlcm5hbCwKICAgICAgICAgQnVmZmVyT3duZWQsCiAgICAgICAg IEJ1ZmZlclN1YnN0cmluZywKKyNpZiBQTEFURk9STShRVCkKKyAgICAgICAgQnVmZmVyQWRvcHRl ZFFTdHJpbmcKKyNlbmRpZgogICAgIH07CiAKICAgICAvLyBVc2VkIHRvIGNvbnN0cnVjdCBzdGF0 aWMgc3RyaW5ncywgd2hpY2ggaGF2ZSBhbiBzcGVjaWFsIHJlZkNvdW50IHRoYXQgY2FuIG5ldmVy IGhpdCB6ZXJvLgpAQCAtMjE1LDYgKzIyMiwyNiBAQCBwcml2YXRlOgogICAgICAgICBtX2hhc2hB bmRGbGFncyA9IGhhc2ggfCBCdWZmZXJJbnRlcm5hbDsKICAgICB9CiAKKyNpZiBQTEFURk9STShR VCkKKyAgICAvLyBVc2VkIHRvIGNyZWF0ZSBuZXcgc3RyaW5ncyB0aGF0IGFkb3B0IGFuIGV4aXN0 aW5nIFFTdHJpbmcncyBkYXRhCisgICAgZW51bSBDb25zdHJ1Y3RBZG9wdGVkUVN0cmluZ1RhZyB7 IENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nIH07CisgICAgU3RyaW5nSW1wbChRU3RyaW5nRGF0YSog cVN0cmluZ0RhdGEsIENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nVGFnKQorICAgICAgICA6IG1fcmVm Q291bnQoc19yZWZDb3VudEluY3JlbWVudCkKKyAgICAgICAgLCBtX2xlbmd0aChxU3RyaW5nRGF0 YS0+c2l6ZSkKKyAgICAgICAgLCBtX2RhdGExNihyZWludGVycHJldF9jYXN0X3B0cjxjb25zdCBV Q2hhcio+KHFTdHJpbmdEYXRhLT5kYXRhKCkpKQorICAgICAgICAsIG1fcVN0cmluZ0RhdGEocVN0 cmluZ0RhdGEpCisgICAgICAgICwgbV9oYXNoQW5kRmxhZ3MoQnVmZmVyQWRvcHRlZFFTdHJpbmcp CisgICAgeworICAgICAgICBBU1NFUlQobV9kYXRhMTYpOworICAgICAgICBBU1NFUlQobV9sZW5n dGgpOworCisgICAgICAgIC8vIFdlIHJlZiB0aGUgc3RyaW5nLWRhdGEgdG8gZW5zdXJlIGl0IHdp bGwgYmUgdmFsaWQgZm9yIHRoZSBsaWZldGltZSBvZgorICAgICAgICAvLyB0aGlzIHN0cmluZy4g V2UgdGhlbiBkZXJlZiBpdCBpbiB0aGUgZGVzdHJ1Y3Rvciwgc28gdGhhdCB0aGUgc3RyaW5nCisg ICAgICAgIC8vIGRhdGEgY2FuIGV2ZW50dWFsbHkgYmUgZnJlZWQuCisgICAgICAgIG1fcVN0cmlu Z0RhdGEtPnJlZi5yZWYoKTsKKyAgICB9CisjZW5kaWYKKwogcHVibGljOgogICAgIFdURl9FWFBP UlRfUFJJVkFURSB+U3RyaW5nSW1wbCgpOwogCkBAIC0zMDgsNiArMzM1LDEwIEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZG9wdChTdHJpbmdCdWZmZXI8TENo YXI+JiBidWZmZXIpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgUGFzc1JlZlB0cjxT dHJpbmdJbXBsPiBhZG9wdChTdHJpbmdCdWZmZXI8VUNoYXI+JiBidWZmZXIpOwogCisjaWYgUExB VEZPUk0oUVQpCisgICAgc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gYWRvcHQoUVN0cmlu Z0RhdGEqKTsKKyNlbmRpZgorCiAgICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4g bV9sZW5ndGg7IH0KICAgICBib29sIGlzOEJpdCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzaEFuZEZs YWdzICYgc19oYXNoRmxhZzhCaXRCdWZmZXI7IH0KIApAQCAtMzY3LDYgKzM5OCwxMCBAQCBwdWJs aWM6CiAgICAgICAgICAgICBtX2hhc2hBbmRGbGFncyAmPSB+c19oYXNoRmxhZ0lzQXRvbWljOwog ICAgIH0KIAorI2lmIFBMQVRGT1JNKFFUKQorICAgIFFTdHJpbmdEYXRhKiBxU3RyaW5nRGF0YSgp IHsgcmV0dXJuIGJ1ZmZlck93bmVyc2hpcCgpID09IEJ1ZmZlckFkb3B0ZWRRU3RyaW5nID8gbV9x U3RyaW5nRGF0YSA6IDA7IH0KKyNlbmRpZgorCiBwcml2YXRlOgogICAgIC8vIFRoZSBoaWdoIGJp dHMgb2YgJ2hhc2gnIGFyZSBhbHdheXMgZW1wdHksIGJ1dCB3ZSBwcmVmZXIgdG8gc3RvcmUgb3Vy IGZsYWdzCiAgICAgLy8gaW4gdGhlIGxvdyBiaXRzIGJlY2F1c2UgaXQgbWFrZXMgdGhlbSBzbGln aHRseSBtb3JlIGVmZmljaWVudCB0byBhY2Nlc3MuCkBAIC01OTEsNiArNjI2LDkgQEAgcHJpdmF0 ZToKICAgICAgICAgdm9pZCogbV9idWZmZXI7CiAgICAgICAgIFN0cmluZ0ltcGwqIG1fc3Vic3Ry aW5nQnVmZmVyOwogICAgICAgICBtdXRhYmxlIFVDaGFyKiBtX2NvcHlEYXRhMTY7CisjaWYgUExB VEZPUk0oUVQpCisgICAgICAgIFFTdHJpbmdEYXRhKiBtX3FTdHJpbmdEYXRhOworI2VuZGlmCiAg ICAgfTsKICAgICBtdXRhYmxlIHVuc2lnbmVkIG1faGFzaEFuZEZsYWdzOwogfTsK 144800 2012-05-30 06:54:38 -0700 2012-05-30 06:59:51 -0700 Patch bug-87847-20120530155436.patch text/plain 7102 vestbo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzYzCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyB3L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzNjY5ZDZiMmZlNDkwYTA2YzRjM2Mz YTQ4NzM1YTI5NWQyODBiZTkuLmNlYTI0MDBjNTdiODNhM2U5ODg4MDY0ZDJiMDg1OWQ1YjgzNjQ4 MzQgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyB3L1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDUtMzAgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBjb252ZXJzaW9u IGZyb20gUVN0cmluZyB0byBXVEY6OlN0cmluZyAoYW5kIGJhY2sgYWdhaW4pIH5mcmVlCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQ3CisKKyAg ICAgICAgSW5zdGVhZCBvZiBjb3B5aW5nIHRoZSBRU3RyaW5nIGRhdGEgd2hlbiBjb252ZXJ0aW5n IHRvIGEgV1RGOjpTdHJpbmcgd2UKKyAgICAgICAgbWFrZSB0aGUgV1RGOjpTdHJpbmcgYWRvcHQg dGhlIFFTdHJpbmcgZGF0YSBieSBpbnRyb2R1Y2luZyBhIG5ldyBidWZmZXIKKyAgICAgICAgb3du ZXJzaGlwIHR5cGUsIGFuZCBwb2ludGluZyB0aGUgaW50ZXJuYWwgV1RGOjpTdHJpbmdJbXBsIDE2 LWJpdCBkYXRhCisgICAgICAgIG1lbWJlciB0byB0aGUgc3RyaW5nIGRhdGEgbWFuYWdlZCBieSBR U3RyaW5nRGF0YS4KKworICAgICAgICBXZSBtYWtlIHN1cmUgdG8gcmVmZXJlbmNlIHRoZSBRU3Ry aW5nRGF0YSB3aGVuIGFkb3B0aW5nLCBzbyB0aGF0IHRoZQorICAgICAgICBkYXRhIHdpbGwgc3Rh eSBhbGl2ZSwgYW5kIHRoZW4gZGVyZWZlcmVuY2UgaXQgd2hlbiB0aGUgV1RGOjpTdHJpbmdJbXBs CisgICAgICAgIGlzIGRlbGV0ZWQsIHdoaWNoIHdpbGwgZnJlZSB0aGUgUVN0cmluZ0RhdGEgKGVp dGhlciBzdHJhaWdodCBhd2F5LCBpZgorICAgICAgICB3ZSdyZSB0aGUgb25seSBvbmUgaG9sZGlu ZyBhIHJlZmVyZW5jZSBzdGlsbCwgb3IgbGF0ZXIsIHdoZW4gdGhlIHJlZgorICAgICAgICBjb3Vu dCBnb2VzIHRvIDApLgorCisgICAgICAgIEluIHRoZSBjYXNlIG9mIGdvaW5nIGJhY2sgZnJvbSBh IFdURjo6U3RyaW5nIHRvIGEgUVN0cmluZyB3ZSBjYW4gY2hlYXQKKyAgICAgICAgYSBiaXQgKGF2 b2lkIGEgY29weSksIGlmIHdlIGtub3cgdGhhdCB0aGUgV1RGOjpTdHJpbmcgd2FzIGFkb3B0ZWQg ZnJvbQorICAgICAgICBhIFFTdHJpbmcsIHNpbmNlIGl0J3MgdGhlbiBqdXN0IGEgbWF0dGVyIG9m IGhhdmluZyB0aGUgUVN0cmluZyBhZG9wdAorICAgICAgICB0aGUgZXhpc3RpbmcgUVN0cmluZ0Rh dGEgKGp1c3QgbGlrZSBhIHJlZ3VsYXIgUVN0cmluZyBjb3B5KS4KKworICAgICAgICBJZiB0aGUg V1RGOjpTdHJpbmcgYnVmZmVyIGlzIG5vdCBvd25lZCBieSBRU3RyaW5nRGF0YSwgZWcgYSByZWd1 bGFyCisgICAgICAgIDgtYml0IG9yIDE2LWJpdCBzdHJpbmcvc3Vic3RyaW5nLCB3ZSBoYXZlIHRv IGZhbGwgYmFjayB0byBjb3B5aW5nLAorICAgICAgICBhcyBiZWZvcmUgKHRob3VnaCB0aGVyZSBh cmUgcG90ZW50aWFsIG9wdGltaXphdGlvbiB0cmlja3Mgd2UgY2FuCisgICAgICAgIGFwcGx5IGhl cmUgbGF0ZXIgb24pLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL3F0L1N0cmluZ1F0LmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJ bXBsLmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJbXBsLmg6CisKIDIwMTItMDUtMjcg IERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhbiBpbmNvcnJl Y3QgYXNzZXJ0aW9uIGluIFZlY3Rvcjo6cmVtb3ZlCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL3d0 Zi9xdC9TdHJpbmdRdC5jcHAgdy9Tb3VyY2UvV1RGL3d0Zi9xdC9TdHJpbmdRdC5jcHAKaW5kZXgg MTZkZDQzOWUzYmNmMWI4NWE2NmJiMWQ1MDk3MjI1NDUwNjM2NjhkYy4uYWYwNmJhZjQ0Njg2OGI0 YmE4YWQ1NzU4OGI0OTI0M2FhM2M4MDgyMyAxMDA2NDQKLS0tIGMvU291cmNlL1dURi93dGYvcXQv U3RyaW5nUXQuY3BwCisrKyB3L1NvdXJjZS9XVEYvd3RmL3F0L1N0cmluZ1F0LmNwcApAQCAtMzcs NyArMzcsNyBAQCBTdHJpbmc6OlN0cmluZyhjb25zdCBRU3RyaW5nJiBxc3RyKQogewogICAgIGlm IChxc3RyLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47Ci0gICAgbV9pbXBsID0gU3RyaW5nSW1w bDo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3RfcHRyPGNvbnN0IFVDaGFyKj4ocXN0ci5jb25zdERh dGEoKSksIHFzdHIubGVuZ3RoKCkpOworICAgIG1faW1wbCA9IFN0cmluZ0ltcGw6OmFkb3B0KGNv bnN0X2Nhc3Q8UVN0cmluZyY+KHFzdHIpLmRhdGFfcHRyKCkpOwogfQogCiBTdHJpbmc6OlN0cmlu Zyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCkBAIC00OSw2ICs0OSwxNyBAQCBTdHJpbmc6OlN0cmlu Zyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCiAKIFN0cmluZzo6b3BlcmF0b3IgUVN0cmluZygpIGNv bnN0CiB7CisgICAgaWYgKCFtX2ltcGwpCisgICAgICAgIHJldHVybiBRU3RyaW5nKCk7CisKKyAg ICBpZiAoUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhID0gbV9pbXBsLT5xU3RyaW5nRGF0YSgpKSB7 CisgICAgICAgIC8vIFRoZSBXVEYgc3RyaW5nIHdhcyBhZG9wdGVkIGZyb20gYSBRU3RyaW5nIGF0 IHNvbWUgcG9pbnQsIHNvIHdlCisgICAgICAgIC8vIGNhbiBqdXN0IGFkb3B0IHRoZSBRU3RyaW5n RGF0YSBsaWtlIGEgcmVndWxhciBRU3RyaW5nIGNvcHkKKyAgICAgICAgcVN0cmluZ0RhdGEtPnJl Zi5yZWYoKTsKKyAgICAgICAgUVN0cmluZ0RhdGFQdHIgcVN0cmluZ0RhdGFQb2ludGVyID0geyBx U3RyaW5nRGF0YSB9OworICAgICAgICByZXR1cm4gUVN0cmluZyhxU3RyaW5nRGF0YVBvaW50ZXIp OworICAgIH0KKwogICAgIHJldHVybiBRU3RyaW5nKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgUUNo YXIqPihjaGFyYWN0ZXJzKCkpLCBsZW5ndGgoKSk7CiB9CiAKZGlmZiAtLWdpdCBjL1NvdXJjZS9X VEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAgdy9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0lt cGwuY3BwCmluZGV4IDM3MmRiMTc2NjZkYWMwZjA2MGI2MDkwZjA5ZjU5NWMzZWVmN2Y0Y2EuLjk4 YjY5MmUyNjk0NTA3NTIzMmFhYzgzODBmODFiM2I3YTZhMzBhMTMgMTAwNjQ0Ci0tLSBjL1NvdXJj ZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAKKysrIHcvU291cmNlL1dURi93dGYvdGV4dC9T dHJpbmdJbXBsLmNwcApAQCAtNjksNiArNjksMTMgQEAgU3RyaW5nSW1wbDo6flN0cmluZ0ltcGwo KQogICAgICAgICBmYXN0RnJlZShjb25zdF9jYXN0PExDaGFyKj4obV9kYXRhOCkpOwogICAgICAg ICByZXR1cm47CiAgICAgfQorI2lmIFBMQVRGT1JNKFFUKQorICAgIGlmIChvd25lcnNoaXAgPT0g QnVmZmVyQWRvcHRlZFFTdHJpbmcpIHsKKyAgICAgICAgaWYgKCFtX3FTdHJpbmdEYXRhLT5yZWYu ZGVyZWYoKSkKKyAgICAgICAgICAgIFFTdHJpbmdEYXRhOjpkZWFsbG9jYXRlKG1fcVN0cmluZ0Rh dGEpOworICAgICAgICByZXR1cm47CisgICAgfQorI2VuZGlmCiAKICAgICBBU1NFUlQob3duZXJz aGlwID09IEJ1ZmZlclN1YnN0cmluZyk7CiAgICAgQVNTRVJUKG1fc3Vic3RyaW5nQnVmZmVyKTsK QEAgLTE2NDQsNiArMTY1MSwxNiBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6 OmFkb3B0KFN0cmluZ0J1ZmZlcjxVQ2hhcj4mIGJ1ZmZlcikKICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IFN0cmluZ0ltcGwoYnVmZmVyLnJlbGVhc2UoKSwgbGVuZ3RoKSk7CiB9CiAKKyNpZiBQTEFU Rk9STShRVCkKK1Bhc3NSZWZQdHI8U3RyaW5nSW1wbD4gU3RyaW5nSW1wbDo6YWRvcHQoUVN0cmlu Z0RhdGEqIHFTdHJpbmdEYXRhKQoreworICAgIGlmICghcVN0cmluZ0RhdGEgfHwgIXFTdHJpbmdE YXRhLT5zaXplKQorICAgICAgICByZXR1cm4gZW1wdHkoKTsKKworICAgIHJldHVybiBhZG9wdFJl ZihuZXcgU3RyaW5nSW1wbChxU3RyaW5nRGF0YSwgQ29uc3RydWN0QWRvcHRlZFFTdHJpbmcpKTsK K30KKyNlbmRpZgorCiBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6OmNyZWF0ZVdp dGhUZXJtaW5hdGluZ051bGxDaGFyYWN0ZXIoY29uc3QgU3RyaW5nSW1wbCYgc3RyaW5nKQogewog ICAgIC8vIFVzZSBjcmVhdGVVbmluaXRpYWxpemVkIGluc3RlYWQgb2YgJ25ldyBTdHJpbmdJbXBs JyBzbyB0aGF0IHRoZSBzdHJpbmcgYW5kIGl0cyBidWZmZXIKZGlmZiAtLWdpdCBjL1NvdXJjZS9X VEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBs LmgKaW5kZXggYjgwNzNiMzA5NzVjMGFlODBmMjkyMTQ0N2VhOGUwNmYzYmYyYzEzNi4uY2Y1YWU1 NWI4NDFiMWZmYjE4ZTA2N2ZiZTQ5MGUxOTUyMzk4MWNmZiAxMDA2NDQKLS0tIGMvU291cmNlL1dU Ri93dGYvdGV4dC9TdHJpbmdJbXBsLmgKKysrIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJ bXBsLmgKQEAgLTMxLDYgKzMxLDEwIEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1 ZGUgPHd0Zi91bmljb2RlL1VuaWNvZGUuaD4KIAorI2lmIFBMQVRGT1JNKFFUKQorI2luY2x1ZGUg PFFTdHJpbmc+CisjZW5kaWYKKwogI2lmIFVTRShDRikKIHR5cGVkZWYgY29uc3Qgc3RydWN0IF9f Q0ZTdHJpbmcgKiBDRlN0cmluZ1JlZjsKICNlbmRpZgpAQCAtODIsNiArODYsOSBAQCBwcml2YXRl OgogICAgICAgICBCdWZmZXJJbnRlcm5hbCwKICAgICAgICAgQnVmZmVyT3duZWQsCiAgICAgICAg IEJ1ZmZlclN1YnN0cmluZywKKyNpZiBQTEFURk9STShRVCkKKyAgICAgICAgQnVmZmVyQWRvcHRl ZFFTdHJpbmcKKyNlbmRpZgogICAgIH07CiAKICAgICAvLyBVc2VkIHRvIGNvbnN0cnVjdCBzdGF0 aWMgc3RyaW5ncywgd2hpY2ggaGF2ZSBhbiBzcGVjaWFsIHJlZkNvdW50IHRoYXQgY2FuIG5ldmVy IGhpdCB6ZXJvLgpAQCAtMjE1LDYgKzIyMiwyOSBAQCBwcml2YXRlOgogICAgICAgICBtX2hhc2hB bmRGbGFncyA9IGhhc2ggfCBCdWZmZXJJbnRlcm5hbDsKICAgICB9CiAKKyNpZiBQTEFURk9STShR VCkKKyAgICAvLyBVc2VkIHRvIGNyZWF0ZSBuZXcgc3RyaW5ncyB0aGF0IGFkb3B0IGFuIGV4aXN0 aW5nIFFTdHJpbmcncyBkYXRhCisgICAgZW51bSBDb25zdHJ1Y3RBZG9wdGVkUVN0cmluZ1RhZyB7 IENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nIH07CisgICAgU3RyaW5nSW1wbChRU3RyaW5nRGF0YSog cVN0cmluZ0RhdGEsIENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nVGFnKQorICAgICAgICA6IG1fcmVm Q291bnQoc19yZWZDb3VudEluY3JlbWVudCkKKyAgICAgICAgLCBtX2xlbmd0aChxU3RyaW5nRGF0 YS0+c2l6ZSkKKyAgICAgICAgLCBtX2RhdGExNigwKQorICAgICAgICAsIG1fcVN0cmluZ0RhdGEo cVN0cmluZ0RhdGEpCisgICAgICAgICwgbV9oYXNoQW5kRmxhZ3MoQnVmZmVyQWRvcHRlZFFTdHJp bmcpCisgICAgeworICAgICAgICBBU1NFUlQobV9sZW5ndGgpOworCisgICAgICAgIC8vIFdlIHJl ZiB0aGUgc3RyaW5nLWRhdGEgdG8gZW5zdXJlIGl0IHdpbGwgYmUgdmFsaWQgZm9yIHRoZSBsaWZl dGltZSBvZgorICAgICAgICAvLyB0aGlzIHN0cmluZy4gV2UgdGhlbiBkZXJlZiBpdCBpbiB0aGUg ZGVzdHJ1Y3Rvciwgc28gdGhhdCB0aGUgc3RyaW5nCisgICAgICAgIC8vIGRhdGEgY2FuIGV2ZW50 dWFsbHkgYmUgZnJlZWQuCisgICAgICAgIG1fcVN0cmluZ0RhdGEtPnJlZi5yZWYoKTsKKworICAg ICAgICAvLyBOb3cgdGhhdCB3ZSBoYXZlIGEgcmVmIHdlIGNhbiBzYWZlbHkgcmVmZXJlbmNlIHRo ZSBzdHJpbmcgZGF0YQorICAgICAgICBtX2RhdGExNiA9IHJlaW50ZXJwcmV0X2Nhc3RfcHRyPGNv bnN0IFVDaGFyKj4ocVN0cmluZ0RhdGEtPmRhdGEoKSk7CisgICAgICAgIEFTU0VSVChtX2RhdGEx Nik7CisgICAgfQorI2VuZGlmCisKIHB1YmxpYzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgflN0 cmluZ0ltcGwoKTsKIApAQCAtMzA4LDYgKzMzOCwxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBh c3NSZWZQdHI8U3RyaW5nSW1wbD4gYWRvcHQoU3RyaW5nQnVmZmVyPExDaGFyPiYgYnVmZmVyKTsK ICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gYWRv cHQoU3RyaW5nQnVmZmVyPFVDaGFyPiYgYnVmZmVyKTsKIAorI2lmIFBMQVRGT1JNKFFUKQorICAg IHN0YXRpYyBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGFkb3B0KFFTdHJpbmdEYXRhKik7CisjZW5k aWYKKwogICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVuZ3RoOyB9CiAg ICAgYm9vbCBpczhCaXQoKSBjb25zdCB7IHJldHVybiBtX2hhc2hBbmRGbGFncyAmIHNfaGFzaEZs YWc4Qml0QnVmZmVyOyB9CiAKQEAgLTM2Nyw2ICs0MDEsMTAgQEAgcHVibGljOgogICAgICAgICAg ICAgbV9oYXNoQW5kRmxhZ3MgJj0gfnNfaGFzaEZsYWdJc0F0b21pYzsKICAgICB9CiAKKyNpZiBQ TEFURk9STShRVCkKKyAgICBRU3RyaW5nRGF0YSogcVN0cmluZ0RhdGEoKSB7IHJldHVybiBidWZm ZXJPd25lcnNoaXAoKSA9PSBCdWZmZXJBZG9wdGVkUVN0cmluZyA/IG1fcVN0cmluZ0RhdGEgOiAw OyB9CisjZW5kaWYKKwogcHJpdmF0ZToKICAgICAvLyBUaGUgaGlnaCBiaXRzIG9mICdoYXNoJyBh cmUgYWx3YXlzIGVtcHR5LCBidXQgd2UgcHJlZmVyIHRvIHN0b3JlIG91ciBmbGFncwogICAgIC8v IGluIHRoZSBsb3cgYml0cyBiZWNhdXNlIGl0IG1ha2VzIHRoZW0gc2xpZ2h0bHkgbW9yZSBlZmZp Y2llbnQgdG8gYWNjZXNzLgpAQCAtNTkxLDYgKzYyOSw5IEBAIHByaXZhdGU6CiAgICAgICAgIHZv aWQqIG1fYnVmZmVyOwogICAgICAgICBTdHJpbmdJbXBsKiBtX3N1YnN0cmluZ0J1ZmZlcjsKICAg ICAgICAgbXV0YWJsZSBVQ2hhciogbV9jb3B5RGF0YTE2OworI2lmIFBMQVRGT1JNKFFUKQorICAg ICAgICBRU3RyaW5nRGF0YSogbV9xU3RyaW5nRGF0YTsKKyNlbmRpZgogICAgIH07CiAgICAgbXV0 YWJsZSB1bnNpZ25lZCBtX2hhc2hBbmRGbGFnczsKIH07Cg== 144803 2012-05-30 06:59:59 -0700 2012-05-30 07:24:47 -0700 Patch bug-87847-20120530155957.patch text/plain 7214 vestbo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzYzCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyB3L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzNjY5ZDZiMmZlNDkwYTA2YzRjM2Mz YTQ4NzM1YTI5NWQyODBiZTkuLmNlYTI0MDBjNTdiODNhM2U5ODg4MDY0ZDJiMDg1OWQ1YjgzNjQ4 MzQgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyB3L1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDUtMzAgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBjb252ZXJzaW9u IGZyb20gUVN0cmluZyB0byBXVEY6OlN0cmluZyAoYW5kIGJhY2sgYWdhaW4pIH5mcmVlCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQ3CisKKyAg ICAgICAgSW5zdGVhZCBvZiBjb3B5aW5nIHRoZSBRU3RyaW5nIGRhdGEgd2hlbiBjb252ZXJ0aW5n IHRvIGEgV1RGOjpTdHJpbmcgd2UKKyAgICAgICAgbWFrZSB0aGUgV1RGOjpTdHJpbmcgYWRvcHQg dGhlIFFTdHJpbmcgZGF0YSBieSBpbnRyb2R1Y2luZyBhIG5ldyBidWZmZXIKKyAgICAgICAgb3du ZXJzaGlwIHR5cGUsIGFuZCBwb2ludGluZyB0aGUgaW50ZXJuYWwgV1RGOjpTdHJpbmdJbXBsIDE2 LWJpdCBkYXRhCisgICAgICAgIG1lbWJlciB0byB0aGUgc3RyaW5nIGRhdGEgbWFuYWdlZCBieSBR U3RyaW5nRGF0YS4KKworICAgICAgICBXZSBtYWtlIHN1cmUgdG8gcmVmZXJlbmNlIHRoZSBRU3Ry aW5nRGF0YSB3aGVuIGFkb3B0aW5nLCBzbyB0aGF0IHRoZQorICAgICAgICBkYXRhIHdpbGwgc3Rh eSBhbGl2ZSwgYW5kIHRoZW4gZGVyZWZlcmVuY2UgaXQgd2hlbiB0aGUgV1RGOjpTdHJpbmdJbXBs CisgICAgICAgIGlzIGRlbGV0ZWQsIHdoaWNoIHdpbGwgZnJlZSB0aGUgUVN0cmluZ0RhdGEgKGVp dGhlciBzdHJhaWdodCBhd2F5LCBpZgorICAgICAgICB3ZSdyZSB0aGUgb25seSBvbmUgaG9sZGlu ZyBhIHJlZmVyZW5jZSBzdGlsbCwgb3IgbGF0ZXIsIHdoZW4gdGhlIHJlZgorICAgICAgICBjb3Vu dCBnb2VzIHRvIDApLgorCisgICAgICAgIEluIHRoZSBjYXNlIG9mIGdvaW5nIGJhY2sgZnJvbSBh IFdURjo6U3RyaW5nIHRvIGEgUVN0cmluZyB3ZSBjYW4gY2hlYXQKKyAgICAgICAgYSBiaXQgKGF2 b2lkIGEgY29weSksIGlmIHdlIGtub3cgdGhhdCB0aGUgV1RGOjpTdHJpbmcgd2FzIGFkb3B0ZWQg ZnJvbQorICAgICAgICBhIFFTdHJpbmcsIHNpbmNlIGl0J3MgdGhlbiBqdXN0IGEgbWF0dGVyIG9m IGhhdmluZyB0aGUgUVN0cmluZyBhZG9wdAorICAgICAgICB0aGUgZXhpc3RpbmcgUVN0cmluZ0Rh dGEgKGp1c3QgbGlrZSBhIHJlZ3VsYXIgUVN0cmluZyBjb3B5KS4KKworICAgICAgICBJZiB0aGUg V1RGOjpTdHJpbmcgYnVmZmVyIGlzIG5vdCBvd25lZCBieSBRU3RyaW5nRGF0YSwgZWcgYSByZWd1 bGFyCisgICAgICAgIDgtYml0IG9yIDE2LWJpdCBzdHJpbmcvc3Vic3RyaW5nLCB3ZSBoYXZlIHRv IGZhbGwgYmFjayB0byBjb3B5aW5nLAorICAgICAgICBhcyBiZWZvcmUgKHRob3VnaCB0aGVyZSBh cmUgcG90ZW50aWFsIG9wdGltaXphdGlvbiB0cmlja3Mgd2UgY2FuCisgICAgICAgIGFwcGx5IGhl cmUgbGF0ZXIgb24pLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL3F0L1N0cmluZ1F0LmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJ bXBsLmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJbXBsLmg6CisKIDIwMTItMDUtMjcg IERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhbiBpbmNvcnJl Y3QgYXNzZXJ0aW9uIGluIFZlY3Rvcjo6cmVtb3ZlCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL3d0 Zi9xdC9TdHJpbmdRdC5jcHAgdy9Tb3VyY2UvV1RGL3d0Zi9xdC9TdHJpbmdRdC5jcHAKaW5kZXgg MTZkZDQzOWUzYmNmMWI4NWE2NmJiMWQ1MDk3MjI1NDUwNjM2NjhkYy4uZGVmMDliM2Q1NzczMDc2 NzdhMGVjMDdmNWI2NGU5NmUwYmU4Njk1NiAxMDA2NDQKLS0tIGMvU291cmNlL1dURi93dGYvcXQv U3RyaW5nUXQuY3BwCisrKyB3L1NvdXJjZS9XVEYvd3RmL3F0L1N0cmluZ1F0LmNwcApAQCAtMzcs NyArMzcsNyBAQCBTdHJpbmc6OlN0cmluZyhjb25zdCBRU3RyaW5nJiBxc3RyKQogewogICAgIGlm IChxc3RyLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47Ci0gICAgbV9pbXBsID0gU3RyaW5nSW1w bDo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3RfcHRyPGNvbnN0IFVDaGFyKj4ocXN0ci5jb25zdERh dGEoKSksIHFzdHIubGVuZ3RoKCkpOworICAgIG1faW1wbCA9IFN0cmluZ0ltcGw6OmFkb3B0KGNv bnN0X2Nhc3Q8UVN0cmluZyY+KHFzdHIpLmRhdGFfcHRyKCkpOwogfQogCiBTdHJpbmc6OlN0cmlu Zyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCkBAIC00OSw2ICs0OSwxNyBAQCBTdHJpbmc6OlN0cmlu Zyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCiAKIFN0cmluZzo6b3BlcmF0b3IgUVN0cmluZygpIGNv bnN0CiB7CisgICAgaWYgKCFtX2ltcGwpCisgICAgICAgIHJldHVybiBRU3RyaW5nKCk7CisKKyAg ICBpZiAoUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhID0gbV9pbXBsLT5xU3RyaW5nRGF0YSgpKSB7 CisgICAgICAgIC8vIFRoZSBXVEYgc3RyaW5nIHdhcyBhZG9wdGVkIGZyb20gYSBRU3RyaW5nIGF0 IHNvbWUgcG9pbnQsIHNvIHdlCisgICAgICAgIC8vIGNhbiBqdXN0IGFkb3B0IHRoZSBRU3RyaW5n RGF0YSBsaWtlIGEgcmVndWxhciBRU3RyaW5nIGNvcHkuCisgICAgICAgIHFTdHJpbmdEYXRhLT5y ZWYucmVmKCk7CisgICAgICAgIFFTdHJpbmdEYXRhUHRyIHFTdHJpbmdEYXRhUG9pbnRlciA9IHsg cVN0cmluZ0RhdGEgfTsKKyAgICAgICAgcmV0dXJuIFFTdHJpbmcocVN0cmluZ0RhdGFQb2ludGVy KTsKKyAgICB9CisKICAgICByZXR1cm4gUVN0cmluZyhyZWludGVycHJldF9jYXN0PGNvbnN0IFFD aGFyKj4oY2hhcmFjdGVycygpKSwgbGVuZ3RoKCkpOwogfQogCmRpZmYgLS1naXQgYy9Tb3VyY2Uv V1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJ bXBsLmNwcAppbmRleCAzNzJkYjE3NjY2ZGFjMGYwNjBiNjA5MGYwOWY1OTVjM2VlZjdmNGNhLi5l N2E4ZjQ0ZDg2N2M2MThhOTNiODJhMzExMzNlNjJjMzc0MmY5ODU3IDEwMDY0NAotLS0gYy9Tb3Vy Y2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwCisrKyB3L1NvdXJjZS9XVEYvd3RmL3RleHQv U3RyaW5nSW1wbC5jcHAKQEAgLTY5LDYgKzY5LDEzIEBAIFN0cmluZ0ltcGw6On5TdHJpbmdJbXBs KCkKICAgICAgICAgZmFzdEZyZWUoY29uc3RfY2FzdDxMQ2hhcio+KG1fZGF0YTgpKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KKyNpZiBQTEFURk9STShRVCkKKyAgICBpZiAob3duZXJzaGlwID09 IEJ1ZmZlckFkb3B0ZWRRU3RyaW5nKSB7CisgICAgICAgIGlmICghbV9xU3RyaW5nRGF0YS0+cmVm LmRlcmVmKCkpCisgICAgICAgICAgICBRU3RyaW5nRGF0YTo6ZGVhbGxvY2F0ZShtX3FTdHJpbmdE YXRhKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgogCiAgICAgQVNTRVJUKG93bmVy c2hpcCA9PSBCdWZmZXJTdWJzdHJpbmcpOwogICAgIEFTU0VSVChtX3N1YnN0cmluZ0J1ZmZlcik7 CkBAIC0xNjQ0LDYgKzE2NTEsMTggQEAgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBTdHJpbmdJbXBs OjphZG9wdChTdHJpbmdCdWZmZXI8VUNoYXI+JiBidWZmZXIpCiAgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBTdHJpbmdJbXBsKGJ1ZmZlci5yZWxlYXNlKCksIGxlbmd0aCkpOwogfQogCisjaWYgUExB VEZPUk0oUVQpCitQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6OmFkb3B0KFFTdHJp bmdEYXRhKiBxU3RyaW5nRGF0YSkKK3sKKyAgICBBU1NFUlQocVN0cmluZ0RhdGEpOworCisgICAg aWYgKCFxU3RyaW5nRGF0YS0+c2l6ZSkKKyAgICAgICAgcmV0dXJuIGVtcHR5KCk7CisKKyAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IFN0cmluZ0ltcGwocVN0cmluZ0RhdGEsIENvbnN0cnVjdEFkb3B0 ZWRRU3RyaW5nKSk7Cit9CisjZW5kaWYKKwogUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBTdHJpbmdJ bXBsOjpjcmVhdGVXaXRoVGVybWluYXRpbmdOdWxsQ2hhcmFjdGVyKGNvbnN0IFN0cmluZ0ltcGwm IHN0cmluZykKIHsKICAgICAvLyBVc2UgY3JlYXRlVW5pbml0aWFsaXplZCBpbnN0ZWFkIG9mICdu ZXcgU3RyaW5nSW1wbCcgc28gdGhhdCB0aGUgc3RyaW5nIGFuZCBpdHMgYnVmZmVyCmRpZmYgLS1n aXQgYy9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaCB3L1NvdXJjZS9XVEYvd3RmL3Rl eHQvU3RyaW5nSW1wbC5oCmluZGV4IGI4MDczYjMwOTc1YzBhZTgwZjI5MjE0NDdlYThlMDZmM2Jm MmMxMzYuLjNjMjY4MDg5NzAwZTQ1MzkxNDJkZGQ5Yzc4MDI5MTU2YzJmYmEzYTkgMTAwNjQ0Ci0t LSBjL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCisrKyB3L1NvdXJjZS9XVEYvd3Rm L3RleHQvU3RyaW5nSW1wbC5oCkBAIC0zMSw2ICszMSwxMCBAQAogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KICNpbmNsdWRlIDx3dGYvdW5pY29kZS9Vbmljb2RlLmg+CiAKKyNpZiBQTEFURk9STShR VCkKKyNpbmNsdWRlIDxRU3RyaW5nPgorI2VuZGlmCisKICNpZiBVU0UoQ0YpCiB0eXBlZGVmIGNv bnN0IHN0cnVjdCBfX0NGU3RyaW5nICogQ0ZTdHJpbmdSZWY7CiAjZW5kaWYKQEAgLTgyLDYgKzg2 LDEwIEBAIHByaXZhdGU6CiAgICAgICAgIEJ1ZmZlckludGVybmFsLAogICAgICAgICBCdWZmZXJP d25lZCwKICAgICAgICAgQnVmZmVyU3Vic3RyaW5nLAorI2lmIFBMQVRGT1JNKFFUKQorICAgICAg ICBCdWZmZXJBZG9wdGVkUVN0cmluZworI2VuZGlmCisgICAgICAgIC8vIE5PVEU6IEFkZGluZyBt b3JlIG93bmVyc2hpcCB0eXBlcyBuZWVkcyB0byBleHRlbmQgbV9oYXNoQW5kRmxhZ3MgYXMgd2Un cmUgYXQgY2FwYWNpdHkKICAgICB9OwogCiAgICAgLy8gVXNlZCB0byBjb25zdHJ1Y3Qgc3RhdGlj IHN0cmluZ3MsIHdoaWNoIGhhdmUgYW4gc3BlY2lhbCByZWZDb3VudCB0aGF0IGNhbiBuZXZlciBo aXQgemVyby4KQEAgLTIxNSw2ICsyMjMsMjkgQEAgcHJpdmF0ZToKICAgICAgICAgbV9oYXNoQW5k RmxhZ3MgPSBoYXNoIHwgQnVmZmVySW50ZXJuYWw7CiAgICAgfQogCisjaWYgUExBVEZPUk0oUVQp CisgICAgLy8gVXNlZCB0byBjcmVhdGUgbmV3IHN0cmluZ3MgdGhhdCBhZG9wdCBhbiBleGlzdGlu ZyBRU3RyaW5nJ3MgZGF0YQorICAgIGVudW0gQ29uc3RydWN0QWRvcHRlZFFTdHJpbmdUYWcgeyBD b25zdHJ1Y3RBZG9wdGVkUVN0cmluZyB9OworICAgIFN0cmluZ0ltcGwoUVN0cmluZ0RhdGEqIHFT dHJpbmdEYXRhLCBDb25zdHJ1Y3RBZG9wdGVkUVN0cmluZ1RhZykKKyAgICAgICAgOiBtX3JlZkNv dW50KHNfcmVmQ291bnRJbmNyZW1lbnQpCisgICAgICAgICwgbV9sZW5ndGgocVN0cmluZ0RhdGEt PnNpemUpCisgICAgICAgICwgbV9kYXRhMTYoMCkKKyAgICAgICAgLCBtX3FTdHJpbmdEYXRhKHFT dHJpbmdEYXRhKQorICAgICAgICAsIG1faGFzaEFuZEZsYWdzKEJ1ZmZlckFkb3B0ZWRRU3RyaW5n KQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fbGVuZ3RoKTsKKworICAgICAgICAvLyBXZSByZWYg dGhlIHN0cmluZy1kYXRhIHRvIGVuc3VyZSBpdCB3aWxsIGJlIHZhbGlkIGZvciB0aGUgbGlmZXRp bWUgb2YKKyAgICAgICAgLy8gdGhpcyBzdHJpbmcuIFdlIHRoZW4gZGVyZWYgaXQgaW4gdGhlIGRl c3RydWN0b3IsIHNvIHRoYXQgdGhlIHN0cmluZworICAgICAgICAvLyBkYXRhIGNhbiBldmVudHVh bGx5IGJlIGZyZWVkLgorICAgICAgICBtX3FTdHJpbmdEYXRhLT5yZWYucmVmKCk7CisKKyAgICAg ICAgLy8gTm93IHRoYXQgd2UgaGF2ZSBhIHJlZiB3ZSBjYW4gc2FmZWx5IHJlZmVyZW5jZSB0aGUg c3RyaW5nIGRhdGEKKyAgICAgICAgbV9kYXRhMTYgPSByZWludGVycHJldF9jYXN0X3B0cjxjb25z dCBVQ2hhcio+KHFTdHJpbmdEYXRhLT5kYXRhKCkpOworICAgICAgICBBU1NFUlQobV9kYXRhMTYp OworICAgIH0KKyNlbmRpZgorCiBwdWJsaWM6CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIH5TdHJp bmdJbXBsKCk7CiAKQEAgLTMwOCw2ICszMzksMTAgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNz UmVmUHRyPFN0cmluZ0ltcGw+IGFkb3B0KFN0cmluZ0J1ZmZlcjxMQ2hhcj4mIGJ1ZmZlcik7CiAg ICAgV1RGX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGFkb3B0 KFN0cmluZ0J1ZmZlcjxVQ2hhcj4mIGJ1ZmZlcik7CiAKKyNpZiBQTEFURk9STShRVCkKKyAgICBz dGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZG9wdChRU3RyaW5nRGF0YSopOworI2VuZGlm CisKICAgICB1bnNpZ25lZCBsZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2xlbmd0aDsgfQogICAg IGJvb2wgaXM4Qml0KCkgY29uc3QgeyByZXR1cm4gbV9oYXNoQW5kRmxhZ3MgJiBzX2hhc2hGbGFn OEJpdEJ1ZmZlcjsgfQogCkBAIC0zNjcsNiArNDAyLDEwIEBAIHB1YmxpYzoKICAgICAgICAgICAg IG1faGFzaEFuZEZsYWdzICY9IH5zX2hhc2hGbGFnSXNBdG9taWM7CiAgICAgfQogCisjaWYgUExB VEZPUk0oUVQpCisgICAgUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhKCkgeyByZXR1cm4gYnVmZmVy T3duZXJzaGlwKCkgPT0gQnVmZmVyQWRvcHRlZFFTdHJpbmcgPyBtX3FTdHJpbmdEYXRhIDogMDsg fQorI2VuZGlmCisKIHByaXZhdGU6CiAgICAgLy8gVGhlIGhpZ2ggYml0cyBvZiAnaGFzaCcgYXJl IGFsd2F5cyBlbXB0eSwgYnV0IHdlIHByZWZlciB0byBzdG9yZSBvdXIgZmxhZ3MKICAgICAvLyBp biB0aGUgbG93IGJpdHMgYmVjYXVzZSBpdCBtYWtlcyB0aGVtIHNsaWdodGx5IG1vcmUgZWZmaWNp ZW50IHRvIGFjY2Vzcy4KQEAgLTU5MSw2ICs2MzAsOSBAQCBwcml2YXRlOgogICAgICAgICB2b2lk KiBtX2J1ZmZlcjsKICAgICAgICAgU3RyaW5nSW1wbCogbV9zdWJzdHJpbmdCdWZmZXI7CiAgICAg ICAgIG11dGFibGUgVUNoYXIqIG1fY29weURhdGExNjsKKyNpZiBQTEFURk9STShRVCkKKyAgICAg ICAgUVN0cmluZ0RhdGEqIG1fcVN0cmluZ0RhdGE7CisjZW5kaWYKICAgICB9OwogICAgIG11dGFi bGUgdW5zaWduZWQgbV9oYXNoQW5kRmxhZ3M7CiB9Owo= 144808 2012-05-30 07:24:55 -0700 2012-05-31 07:40:03 -0700 Patch bug-87847-20120530162453.patch text/plain 7913 vestbo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzYzCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyB3L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzNjY5ZDZiMmZlNDkwYTA2YzRjM2Mz YTQ4NzM1YTI5NWQyODBiZTkuLmNlYTI0MDBjNTdiODNhM2U5ODg4MDY0ZDJiMDg1OWQ1YjgzNjQ4 MzQgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyB3L1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDUtMzAgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBjb252ZXJzaW9u IGZyb20gUVN0cmluZyB0byBXVEY6OlN0cmluZyAoYW5kIGJhY2sgYWdhaW4pIH5mcmVlCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQ3CisKKyAg ICAgICAgSW5zdGVhZCBvZiBjb3B5aW5nIHRoZSBRU3RyaW5nIGRhdGEgd2hlbiBjb252ZXJ0aW5n IHRvIGEgV1RGOjpTdHJpbmcgd2UKKyAgICAgICAgbWFrZSB0aGUgV1RGOjpTdHJpbmcgYWRvcHQg dGhlIFFTdHJpbmcgZGF0YSBieSBpbnRyb2R1Y2luZyBhIG5ldyBidWZmZXIKKyAgICAgICAgb3du ZXJzaGlwIHR5cGUsIGFuZCBwb2ludGluZyB0aGUgaW50ZXJuYWwgV1RGOjpTdHJpbmdJbXBsIDE2 LWJpdCBkYXRhCisgICAgICAgIG1lbWJlciB0byB0aGUgc3RyaW5nIGRhdGEgbWFuYWdlZCBieSBR U3RyaW5nRGF0YS4KKworICAgICAgICBXZSBtYWtlIHN1cmUgdG8gcmVmZXJlbmNlIHRoZSBRU3Ry aW5nRGF0YSB3aGVuIGFkb3B0aW5nLCBzbyB0aGF0IHRoZQorICAgICAgICBkYXRhIHdpbGwgc3Rh eSBhbGl2ZSwgYW5kIHRoZW4gZGVyZWZlcmVuY2UgaXQgd2hlbiB0aGUgV1RGOjpTdHJpbmdJbXBs CisgICAgICAgIGlzIGRlbGV0ZWQsIHdoaWNoIHdpbGwgZnJlZSB0aGUgUVN0cmluZ0RhdGEgKGVp dGhlciBzdHJhaWdodCBhd2F5LCBpZgorICAgICAgICB3ZSdyZSB0aGUgb25seSBvbmUgaG9sZGlu ZyBhIHJlZmVyZW5jZSBzdGlsbCwgb3IgbGF0ZXIsIHdoZW4gdGhlIHJlZgorICAgICAgICBjb3Vu dCBnb2VzIHRvIDApLgorCisgICAgICAgIEluIHRoZSBjYXNlIG9mIGdvaW5nIGJhY2sgZnJvbSBh IFdURjo6U3RyaW5nIHRvIGEgUVN0cmluZyB3ZSBjYW4gY2hlYXQKKyAgICAgICAgYSBiaXQgKGF2 b2lkIGEgY29weSksIGlmIHdlIGtub3cgdGhhdCB0aGUgV1RGOjpTdHJpbmcgd2FzIGFkb3B0ZWQg ZnJvbQorICAgICAgICBhIFFTdHJpbmcsIHNpbmNlIGl0J3MgdGhlbiBqdXN0IGEgbWF0dGVyIG9m IGhhdmluZyB0aGUgUVN0cmluZyBhZG9wdAorICAgICAgICB0aGUgZXhpc3RpbmcgUVN0cmluZ0Rh dGEgKGp1c3QgbGlrZSBhIHJlZ3VsYXIgUVN0cmluZyBjb3B5KS4KKworICAgICAgICBJZiB0aGUg V1RGOjpTdHJpbmcgYnVmZmVyIGlzIG5vdCBvd25lZCBieSBRU3RyaW5nRGF0YSwgZWcgYSByZWd1 bGFyCisgICAgICAgIDgtYml0IG9yIDE2LWJpdCBzdHJpbmcvc3Vic3RyaW5nLCB3ZSBoYXZlIHRv IGZhbGwgYmFjayB0byBjb3B5aW5nLAorICAgICAgICBhcyBiZWZvcmUgKHRob3VnaCB0aGVyZSBh cmUgcG90ZW50aWFsIG9wdGltaXphdGlvbiB0cmlja3Mgd2UgY2FuCisgICAgICAgIGFwcGx5IGhl cmUgbGF0ZXIgb24pLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL3F0L1N0cmluZ1F0LmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJ bXBsLmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJbXBsLmg6CisKIDIwMTItMDUtMjcg IERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhbiBpbmNvcnJl Y3QgYXNzZXJ0aW9uIGluIFZlY3Rvcjo6cmVtb3ZlCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL3d0 Zi9xdC9TdHJpbmdRdC5jcHAgdy9Tb3VyY2UvV1RGL3d0Zi9xdC9TdHJpbmdRdC5jcHAKaW5kZXgg MTZkZDQzOWUzYmNmMWI4NWE2NmJiMWQ1MDk3MjI1NDUwNjM2NjhkYy4uMjI5YTBlMTFjMTYxMzE5 Y2ExNWNjZDRlNjRlYTBlMjU1OTdkZTgyNiAxMDA2NDQKLS0tIGMvU291cmNlL1dURi93dGYvcXQv U3RyaW5nUXQuY3BwCisrKyB3L1NvdXJjZS9XVEYvd3RmL3F0L1N0cmluZ1F0LmNwcApAQCAtMzcs NyArMzcsMTEgQEAgU3RyaW5nOjpTdHJpbmcoY29uc3QgUVN0cmluZyYgcXN0cikKIHsKICAgICBp ZiAocXN0ci5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOworI2lmIEhBVkUoUVQ1KQorICAgIG1f aW1wbCA9IFN0cmluZ0ltcGw6OmFkb3B0KGNvbnN0X2Nhc3Q8UVN0cmluZyY+KHFzdHIpLmRhdGFf cHRyKCkpOworI2Vsc2UKICAgICBtX2ltcGwgPSBTdHJpbmdJbXBsOjpjcmVhdGUocmVpbnRlcnBy ZXRfY2FzdF9wdHI8Y29uc3QgVUNoYXIqPihxc3RyLmNvbnN0RGF0YSgpKSwgcXN0ci5sZW5ndGgo KSk7CisjZW5kaWYKIH0KIAogU3RyaW5nOjpTdHJpbmcoY29uc3QgUVN0cmluZ1JlZiYgcmVmKQpA QCAtNDksNiArNTMsMTkgQEAgU3RyaW5nOjpTdHJpbmcoY29uc3QgUVN0cmluZ1JlZiYgcmVmKQog CiBTdHJpbmc6Om9wZXJhdG9yIFFTdHJpbmcoKSBjb25zdAogeworICAgIGlmICghbV9pbXBsKQor ICAgICAgICByZXR1cm4gUVN0cmluZygpOworCisjaWYgSEFWRShRVDUpCisgICAgaWYgKFFTdHJp bmdEYXRhKiBxU3RyaW5nRGF0YSA9IG1faW1wbC0+cVN0cmluZ0RhdGEoKSkgeworICAgICAgICAv LyBUaGUgV1RGIHN0cmluZyB3YXMgYWRvcHRlZCBmcm9tIGEgUVN0cmluZyBhdCBzb21lIHBvaW50 LCBzbyB3ZQorICAgICAgICAvLyBjYW4ganVzdCBhZG9wdCB0aGUgUVN0cmluZ0RhdGEgbGlrZSBh IHJlZ3VsYXIgUVN0cmluZyBjb3B5LgorICAgICAgICBxU3RyaW5nRGF0YS0+cmVmLnJlZigpOwor ICAgICAgICBRU3RyaW5nRGF0YVB0ciBxU3RyaW5nRGF0YVBvaW50ZXIgPSB7IHFTdHJpbmdEYXRh IH07CisgICAgICAgIHJldHVybiBRU3RyaW5nKHFTdHJpbmdEYXRhUG9pbnRlcik7CisgICAgfQor I2VuZGlmCisKICAgICByZXR1cm4gUVN0cmluZyhyZWludGVycHJldF9jYXN0PGNvbnN0IFFDaGFy Kj4oY2hhcmFjdGVycygpKSwgbGVuZ3RoKCkpOwogfQogCmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RG L3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBs LmNwcAppbmRleCAzNzJkYjE3NjY2ZGFjMGYwNjBiNjA5MGYwOWY1OTVjM2VlZjdmNGNhLi5jNDM1 OWMxMTMzODk4NGZlZGEyNWY4NzBmMzc2Yzg3ZjA5YWMwOTU4IDEwMDY0NAotLS0gYy9Tb3VyY2Uv V1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwCisrKyB3L1NvdXJjZS9XVEYvd3RmL3RleHQvU3Ry aW5nSW1wbC5jcHAKQEAgLTY5LDYgKzY5LDEzIEBAIFN0cmluZ0ltcGw6On5TdHJpbmdJbXBsKCkK ICAgICAgICAgZmFzdEZyZWUoY29uc3RfY2FzdDxMQ2hhcio+KG1fZGF0YTgpKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KKyNpZiBQTEFURk9STShRVCkgJiYgSEFWRShRVDUpCisgICAgaWYgKG93 bmVyc2hpcCA9PSBCdWZmZXJBZG9wdGVkUVN0cmluZykgeworICAgICAgICBpZiAoIW1fcVN0cmlu Z0RhdGEtPnJlZi5kZXJlZigpKQorICAgICAgICAgICAgUVN0cmluZ0RhdGE6OmRlYWxsb2NhdGUo bV9xU3RyaW5nRGF0YSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisjZW5kaWYKIAogICAgIEFT U0VSVChvd25lcnNoaXAgPT0gQnVmZmVyU3Vic3RyaW5nKTsKICAgICBBU1NFUlQobV9zdWJzdHJp bmdCdWZmZXIpOwpAQCAtMTY0NCw2ICsxNjUxLDE4IEBAIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4g U3RyaW5nSW1wbDo6YWRvcHQoU3RyaW5nQnVmZmVyPFVDaGFyPiYgYnVmZmVyKQogICAgIHJldHVy biBhZG9wdFJlZihuZXcgU3RyaW5nSW1wbChidWZmZXIucmVsZWFzZSgpLCBsZW5ndGgpKTsKIH0K IAorI2lmIFBMQVRGT1JNKFFUKSAmJiBIQVZFKFFUNSkKK1Bhc3NSZWZQdHI8U3RyaW5nSW1wbD4g U3RyaW5nSW1wbDo6YWRvcHQoUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhKQoreworICAgIEFTU0VS VChxU3RyaW5nRGF0YSk7CisKKyAgICBpZiAoIXFTdHJpbmdEYXRhLT5zaXplKQorICAgICAgICBy ZXR1cm4gZW1wdHkoKTsKKworICAgIHJldHVybiBhZG9wdFJlZihuZXcgU3RyaW5nSW1wbChxU3Ry aW5nRGF0YSwgQ29uc3RydWN0QWRvcHRlZFFTdHJpbmcpKTsKK30KKyNlbmRpZgorCiBQYXNzUmVm UHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6OmNyZWF0ZVdpdGhUZXJtaW5hdGluZ051bGxDaGFy YWN0ZXIoY29uc3QgU3RyaW5nSW1wbCYgc3RyaW5nKQogewogICAgIC8vIFVzZSBjcmVhdGVVbmlu aXRpYWxpemVkIGluc3RlYWQgb2YgJ25ldyBTdHJpbmdJbXBsJyBzbyB0aGF0IHRoZSBzdHJpbmcg YW5kIGl0cyBidWZmZXIKZGlmZiAtLWdpdCBjL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1w bC5oIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmgKaW5kZXggYjgwNzNiMzA5NzVj MGFlODBmMjkyMTQ0N2VhOGUwNmYzYmYyYzEzNi4uZWM0NDkzZTczOTY4NzgwMjg1YzlkNDI2MTQ1 YjMxOWUwYjkwNjliZSAxMDA2NDQKLS0tIGMvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBs LmgKKysrIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmgKQEAgLTMxLDYgKzMxLDEw IEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi91bmljb2RlL1VuaWNv ZGUuaD4KIAorI2lmIFBMQVRGT1JNKFFUKSAmJiBIQVZFKFFUNSkKKyNpbmNsdWRlIDxRU3RyaW5n PgorI2VuZGlmCisKICNpZiBVU0UoQ0YpCiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfX0NGU3RyaW5n ICogQ0ZTdHJpbmdSZWY7CiAjZW5kaWYKQEAgLTgyLDYgKzg2LDEwIEBAIHByaXZhdGU6CiAgICAg ICAgIEJ1ZmZlckludGVybmFsLAogICAgICAgICBCdWZmZXJPd25lZCwKICAgICAgICAgQnVmZmVy U3Vic3RyaW5nLAorI2lmIFBMQVRGT1JNKFFUKSAmJiBIQVZFKFFUNSkKKyAgICAgICAgQnVmZmVy QWRvcHRlZFFTdHJpbmcKKyNlbmRpZgorICAgICAgICAvLyBOT1RFOiBBZGRpbmcgbW9yZSBvd25l cnNoaXAgdHlwZXMgbmVlZHMgdG8gZXh0ZW5kIG1faGFzaEFuZEZsYWdzIGFzIHdlJ3JlIGF0IGNh cGFjaXR5CiAgICAgfTsKIAogICAgIC8vIFVzZWQgdG8gY29uc3RydWN0IHN0YXRpYyBzdHJpbmdz LCB3aGljaCBoYXZlIGFuIHNwZWNpYWwgcmVmQ291bnQgdGhhdCBjYW4gbmV2ZXIgaGl0IHplcm8u CkBAIC0yMTUsNiArMjIzLDI5IEBAIHByaXZhdGU6CiAgICAgICAgIG1faGFzaEFuZEZsYWdzID0g aGFzaCB8IEJ1ZmZlckludGVybmFsOwogICAgIH0KIAorI2lmIFBMQVRGT1JNKFFUKSAmJiBIQVZF KFFUNSkKKyAgICAvLyBVc2VkIHRvIGNyZWF0ZSBuZXcgc3RyaW5ncyB0aGF0IGFkb3B0IGFuIGV4 aXN0aW5nIFFTdHJpbmcncyBkYXRhCisgICAgZW51bSBDb25zdHJ1Y3RBZG9wdGVkUVN0cmluZ1Rh ZyB7IENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nIH07CisgICAgU3RyaW5nSW1wbChRU3RyaW5nRGF0 YSogcVN0cmluZ0RhdGEsIENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nVGFnKQorICAgICAgICA6IG1f cmVmQ291bnQoc19yZWZDb3VudEluY3JlbWVudCkKKyAgICAgICAgLCBtX2xlbmd0aChxU3RyaW5n RGF0YS0+c2l6ZSkKKyAgICAgICAgLCBtX2RhdGExNigwKQorICAgICAgICAsIG1fcVN0cmluZ0Rh dGEocVN0cmluZ0RhdGEpCisgICAgICAgICwgbV9oYXNoQW5kRmxhZ3MoQnVmZmVyQWRvcHRlZFFT dHJpbmcpCisgICAgeworICAgICAgICBBU1NFUlQobV9sZW5ndGgpOworCisgICAgICAgIC8vIFdl IHJlZiB0aGUgc3RyaW5nLWRhdGEgdG8gZW5zdXJlIGl0IHdpbGwgYmUgdmFsaWQgZm9yIHRoZSBs aWZldGltZSBvZgorICAgICAgICAvLyB0aGlzIHN0cmluZy4gV2UgdGhlbiBkZXJlZiBpdCBpbiB0 aGUgZGVzdHJ1Y3Rvciwgc28gdGhhdCB0aGUgc3RyaW5nCisgICAgICAgIC8vIGRhdGEgY2FuIGV2 ZW50dWFsbHkgYmUgZnJlZWQuCisgICAgICAgIG1fcVN0cmluZ0RhdGEtPnJlZi5yZWYoKTsKKwor ICAgICAgICAvLyBOb3cgdGhhdCB3ZSBoYXZlIGEgcmVmIHdlIGNhbiBzYWZlbHkgcmVmZXJlbmNl IHRoZSBzdHJpbmcgZGF0YQorICAgICAgICBtX2RhdGExNiA9IHJlaW50ZXJwcmV0X2Nhc3RfcHRy PGNvbnN0IFVDaGFyKj4ocVN0cmluZ0RhdGEtPmRhdGEoKSk7CisgICAgICAgIEFTU0VSVChtX2Rh dGExNik7CisgICAgfQorI2VuZGlmCisKIHB1YmxpYzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUg flN0cmluZ0ltcGwoKTsKIApAQCAtMzA4LDYgKzMzOSwxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gYWRvcHQoU3RyaW5nQnVmZmVyPExDaGFyPiYgYnVmZmVy KTsKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4g YWRvcHQoU3RyaW5nQnVmZmVyPFVDaGFyPiYgYnVmZmVyKTsKIAorI2lmIFBMQVRGT1JNKFFUKSAm JiBIQVZFKFFUNSkKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZG9wdChRU3Ry aW5nRGF0YSopOworI2VuZGlmCisKICAgICB1bnNpZ25lZCBsZW5ndGgoKSBjb25zdCB7IHJldHVy biBtX2xlbmd0aDsgfQogICAgIGJvb2wgaXM4Qml0KCkgY29uc3QgeyByZXR1cm4gbV9oYXNoQW5k RmxhZ3MgJiBzX2hhc2hGbGFnOEJpdEJ1ZmZlcjsgfQogCkBAIC0zNjcsNiArNDAyLDEwIEBAIHB1 YmxpYzoKICAgICAgICAgICAgIG1faGFzaEFuZEZsYWdzICY9IH5zX2hhc2hGbGFnSXNBdG9taWM7 CiAgICAgfQogCisjaWYgUExBVEZPUk0oUVQpICYmIEhBVkUoUVQ1KQorICAgIFFTdHJpbmdEYXRh KiBxU3RyaW5nRGF0YSgpIHsgcmV0dXJuIGJ1ZmZlck93bmVyc2hpcCgpID09IEJ1ZmZlckFkb3B0 ZWRRU3RyaW5nID8gbV9xU3RyaW5nRGF0YSA6IDA7IH0KKyNlbmRpZgorCiBwcml2YXRlOgogICAg IC8vIFRoZSBoaWdoIGJpdHMgb2YgJ2hhc2gnIGFyZSBhbHdheXMgZW1wdHksIGJ1dCB3ZSBwcmVm ZXIgdG8gc3RvcmUgb3VyIGZsYWdzCiAgICAgLy8gaW4gdGhlIGxvdyBiaXRzIGJlY2F1c2UgaXQg bWFrZXMgdGhlbSBzbGlnaHRseSBtb3JlIGVmZmljaWVudCB0byBhY2Nlc3MuCkBAIC01OTEsNiAr NjMwLDkgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCogbV9idWZmZXI7CiAgICAgICAgIFN0cmlu Z0ltcGwqIG1fc3Vic3RyaW5nQnVmZmVyOwogICAgICAgICBtdXRhYmxlIFVDaGFyKiBtX2NvcHlE YXRhMTY7CisjaWYgUExBVEZPUk0oUVQpICYmIEhBVkUoUVQ1KQorICAgICAgICBRU3RyaW5nRGF0 YSogbV9xU3RyaW5nRGF0YTsKKyNlbmRpZgogICAgIH07CiAgICAgbXV0YWJsZSB1bnNpZ25lZCBt X2hhc2hBbmRGbGFnczsKIH07CmRpZmYgLS1naXQgYy9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1 cmVzL2RlZmF1bHRfcG9zdC5wcmYgdy9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1 bHRfcG9zdC5wcmYKaW5kZXggYzM3ZDcxYjYyZDk1MTM1M2U2ZTNlYTUyNTMwOGIwZjE3NTUzMDhh Yy4uNzdkN2NiNmVkM2E5MTEzOTAzM2ZjMGUxNjc2YzA1YmIxZDAzZWIxZSAxMDA2NDQKLS0tIGMv VG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCisrKyB3L1Rvb2xz L3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZgpAQCAtMjEsNiArMjEsOCBA QCBpc0VtcHR5KE9CSkVDVFNfRElSKTogT0JKRUNUU19ESVIgPSBvYmovJCRhY3RpdmVCdWlsZENv bmZpZygpCiBERUZJTkVTICs9IFwKICAgICBCVUlMRElOR19RVF9fPTEKIAoraGF2ZVF0KDUpOiBE RUZJTkVTICs9IEhBVkVfUVQ1CisKIENPTkZJRyhyZWxlYXNlLCBkZWJ1Z3xyZWxlYXNlKTogREVG SU5FUyAqPSBOREVCVUcKIAogQ09ORklHICs9IGRlcGVuZF9pbmNsdWRlcGF0aAo= 145089 2012-05-31 07:40:12 -0700 2012-05-31 15:35:47 -0700 Patch bug-87847-20120531164010.patch text/plain 7407 vestbo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MDk4CmRpZmYgLS1naXQgYy9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyB3L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDg1ZjNiOWIwNGQzZDY0Zjk1OWU3YjAz N2RkYTQ0OGZmYmVjNWIzNWMuLmJmODQ3ZjAyMWJkM2YyMTYxNWMwNWFlZTFiMjY3ZGU2NzhhMjU3 ZGYgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyB3L1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMDUtMzAgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBjb252ZXJzaW9u IGZyb20gUVN0cmluZyB0byBXVEY6OlN0cmluZyAoYW5kIGJhY2sgYWdhaW4pIH5mcmVlCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQ3CisKKyAg ICAgICAgSW5zdGVhZCBvZiBjb3B5aW5nIHRoZSBRU3RyaW5nIGRhdGEgd2hlbiBjb252ZXJ0aW5n IHRvIGEgV1RGOjpTdHJpbmcgd2UKKyAgICAgICAgbWFrZSB0aGUgV1RGOjpTdHJpbmcgYWRvcHQg dGhlIFFTdHJpbmcgZGF0YSBieSBpbnRyb2R1Y2luZyBhIG5ldyBidWZmZXIKKyAgICAgICAgb3du ZXJzaGlwIHR5cGUsIGFuZCBwb2ludGluZyB0aGUgaW50ZXJuYWwgV1RGOjpTdHJpbmdJbXBsIDE2 LWJpdCBkYXRhCisgICAgICAgIG1lbWJlciB0byB0aGUgc3RyaW5nIGRhdGEgbWFuYWdlZCBieSBR U3RyaW5nRGF0YS4KKworICAgICAgICBXZSBtYWtlIHN1cmUgdG8gcmVmZXJlbmNlIHRoZSBRU3Ry aW5nRGF0YSB3aGVuIGFkb3B0aW5nLCBzbyB0aGF0IHRoZQorICAgICAgICBkYXRhIHdpbGwgc3Rh eSBhbGl2ZSwgYW5kIHRoZW4gZGVyZWZlcmVuY2UgaXQgd2hlbiB0aGUgV1RGOjpTdHJpbmdJbXBs CisgICAgICAgIGlzIGRlbGV0ZWQsIHdoaWNoIHdpbGwgZnJlZSB0aGUgUVN0cmluZ0RhdGEgKGVp dGhlciBzdHJhaWdodCBhd2F5LCBpZgorICAgICAgICB3ZSdyZSB0aGUgb25seSBvbmUgaG9sZGlu ZyBhIHJlZmVyZW5jZSBzdGlsbCwgb3IgbGF0ZXIsIHdoZW4gdGhlIHJlZgorICAgICAgICBjb3Vu dCBnb2VzIHRvIDApLgorCisgICAgICAgIEluIHRoZSBjYXNlIG9mIGdvaW5nIGJhY2sgZnJvbSBh IFdURjo6U3RyaW5nIHRvIGEgUVN0cmluZyB3ZSBjYW4gY2hlYXQKKyAgICAgICAgYSBiaXQgKGF2 b2lkIGEgY29weSksIGlmIHdlIGtub3cgdGhhdCB0aGUgV1RGOjpTdHJpbmcgd2FzIGFkb3B0ZWQg ZnJvbQorICAgICAgICBhIFFTdHJpbmcsIHNpbmNlIGl0J3MgdGhlbiBqdXN0IGEgbWF0dGVyIG9m IGhhdmluZyB0aGUgUVN0cmluZyBhZG9wdAorICAgICAgICB0aGUgZXhpc3RpbmcgUVN0cmluZ0Rh dGEgKGp1c3QgbGlrZSBhIHJlZ3VsYXIgUVN0cmluZyBjb3B5KS4KKworICAgICAgICBJZiB0aGUg V1RGOjpTdHJpbmcgYnVmZmVyIGlzIG5vdCBvd25lZCBieSBRU3RyaW5nRGF0YSwgZWcgYSByZWd1 bGFyCisgICAgICAgIDgtYml0IG9yIDE2LWJpdCBzdHJpbmcvc3Vic3RyaW5nLCB3ZSBoYXZlIHRv IGZhbGwgYmFjayB0byBjb3B5aW5nLAorICAgICAgICBhcyBiZWZvcmUgKHRob3VnaCB0aGVyZSBh cmUgcG90ZW50aWFsIG9wdGltaXphdGlvbiB0cmlja3Mgd2UgY2FuCisgICAgICAgIGFwcGx5IGhl cmUgbGF0ZXIgb24pLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL3F0L1N0cmluZ1F0LmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJ bXBsLmNwcDoKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdJbXBsLmg6CisKIDIwMTItMDUtMzEg IFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAg IFtRdF0gU2ltcGxpZnkgUVRfVkVSU0lPTl9DSEVDS1MgZm9yIFF0NSBieSBpbnRyb2R1Y2luZyBI QVZFKFFUNSkKZGlmZiAtLWdpdCBjL1NvdXJjZS9XVEYvd3RmL3F0L1N0cmluZ1F0LmNwcCB3L1Nv dXJjZS9XVEYvd3RmL3F0L1N0cmluZ1F0LmNwcAppbmRleCAxNmRkNDM5ZTNiY2YxYjg1YTY2YmIx ZDUwOTcyMjU0NTA2MzY2OGRjLi4yMjlhMGUxMWMxNjEzMTljYTE1Y2NkNGU2NGVhMGUyNTU5N2Rl ODI2IDEwMDY0NAotLS0gYy9Tb3VyY2UvV1RGL3d0Zi9xdC9TdHJpbmdRdC5jcHAKKysrIHcvU291 cmNlL1dURi93dGYvcXQvU3RyaW5nUXQuY3BwCkBAIC0zNyw3ICszNywxMSBAQCBTdHJpbmc6OlN0 cmluZyhjb25zdCBRU3RyaW5nJiBxc3RyKQogewogICAgIGlmIChxc3RyLmlzTnVsbCgpKQogICAg ICAgICByZXR1cm47CisjaWYgSEFWRShRVDUpCisgICAgbV9pbXBsID0gU3RyaW5nSW1wbDo6YWRv cHQoY29uc3RfY2FzdDxRU3RyaW5nJj4ocXN0cikuZGF0YV9wdHIoKSk7CisjZWxzZQogICAgIG1f aW1wbCA9IFN0cmluZ0ltcGw6OmNyZWF0ZShyZWludGVycHJldF9jYXN0X3B0cjxjb25zdCBVQ2hh cio+KHFzdHIuY29uc3REYXRhKCkpLCBxc3RyLmxlbmd0aCgpKTsKKyNlbmRpZgogfQogCiBTdHJp bmc6OlN0cmluZyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCkBAIC00OSw2ICs1MywxOSBAQCBTdHJp bmc6OlN0cmluZyhjb25zdCBRU3RyaW5nUmVmJiByZWYpCiAKIFN0cmluZzo6b3BlcmF0b3IgUVN0 cmluZygpIGNvbnN0CiB7CisgICAgaWYgKCFtX2ltcGwpCisgICAgICAgIHJldHVybiBRU3RyaW5n KCk7CisKKyNpZiBIQVZFKFFUNSkKKyAgICBpZiAoUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhID0g bV9pbXBsLT5xU3RyaW5nRGF0YSgpKSB7CisgICAgICAgIC8vIFRoZSBXVEYgc3RyaW5nIHdhcyBh ZG9wdGVkIGZyb20gYSBRU3RyaW5nIGF0IHNvbWUgcG9pbnQsIHNvIHdlCisgICAgICAgIC8vIGNh biBqdXN0IGFkb3B0IHRoZSBRU3RyaW5nRGF0YSBsaWtlIGEgcmVndWxhciBRU3RyaW5nIGNvcHku CisgICAgICAgIHFTdHJpbmdEYXRhLT5yZWYucmVmKCk7CisgICAgICAgIFFTdHJpbmdEYXRhUHRy IHFTdHJpbmdEYXRhUG9pbnRlciA9IHsgcVN0cmluZ0RhdGEgfTsKKyAgICAgICAgcmV0dXJuIFFT dHJpbmcocVN0cmluZ0RhdGFQb2ludGVyKTsKKyAgICB9CisjZW5kaWYKKwogICAgIHJldHVybiBR U3RyaW5nKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgUUNoYXIqPihjaGFyYWN0ZXJzKCkpLCBsZW5n dGgoKSk7CiB9CiAKZGlmZiAtLWdpdCBjL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5j cHAgdy9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwCmluZGV4IDM3MmRiMTc2NjZk YWMwZjA2MGI2MDkwZjA5ZjU5NWMzZWVmN2Y0Y2EuLmM0MzU5YzExMzM4OTg0ZmVkYTI1Zjg3MGYz NzZjODdmMDlhYzA5NTggMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1w bC5jcHAKKysrIHcvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmNwcApAQCAtNjksNiAr NjksMTMgQEAgU3RyaW5nSW1wbDo6flN0cmluZ0ltcGwoKQogICAgICAgICBmYXN0RnJlZShjb25z dF9jYXN0PExDaGFyKj4obV9kYXRhOCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQorI2lmIFBM QVRGT1JNKFFUKSAmJiBIQVZFKFFUNSkKKyAgICBpZiAob3duZXJzaGlwID09IEJ1ZmZlckFkb3B0 ZWRRU3RyaW5nKSB7CisgICAgICAgIGlmICghbV9xU3RyaW5nRGF0YS0+cmVmLmRlcmVmKCkpCisg ICAgICAgICAgICBRU3RyaW5nRGF0YTo6ZGVhbGxvY2F0ZShtX3FTdHJpbmdEYXRhKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgogCiAgICAgQVNTRVJUKG93bmVyc2hpcCA9PSBCdWZm ZXJTdWJzdHJpbmcpOwogICAgIEFTU0VSVChtX3N1YnN0cmluZ0J1ZmZlcik7CkBAIC0xNjQ0LDYg KzE2NTEsMTggQEAgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBTdHJpbmdJbXBsOjphZG9wdChTdHJp bmdCdWZmZXI8VUNoYXI+JiBidWZmZXIpCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdHJpbmdJ bXBsKGJ1ZmZlci5yZWxlYXNlKCksIGxlbmd0aCkpOwogfQogCisjaWYgUExBVEZPUk0oUVQpICYm IEhBVkUoUVQ1KQorUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBTdHJpbmdJbXBsOjphZG9wdChRU3Ry aW5nRGF0YSogcVN0cmluZ0RhdGEpCit7CisgICAgQVNTRVJUKHFTdHJpbmdEYXRhKTsKKworICAg IGlmICghcVN0cmluZ0RhdGEtPnNpemUpCisgICAgICAgIHJldHVybiBlbXB0eSgpOworCisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBTdHJpbmdJbXBsKHFTdHJpbmdEYXRhLCBDb25zdHJ1Y3RBZG9w dGVkUVN0cmluZykpOworfQorI2VuZGlmCisKIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gU3RyaW5n SW1wbDo6Y3JlYXRlV2l0aFRlcm1pbmF0aW5nTnVsbENoYXJhY3Rlcihjb25zdCBTdHJpbmdJbXBs JiBzdHJpbmcpCiB7CiAgICAgLy8gVXNlIGNyZWF0ZVVuaW5pdGlhbGl6ZWQgaW5zdGVhZCBvZiAn bmV3IFN0cmluZ0ltcGwnIHNvIHRoYXQgdGhlIHN0cmluZyBhbmQgaXRzIGJ1ZmZlcgpkaWZmIC0t Z2l0IGMvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmggdy9Tb3VyY2UvV1RGL3d0Zi90 ZXh0L1N0cmluZ0ltcGwuaAppbmRleCBiODA3M2IzMDk3NWMwYWU4MGYyOTIxNDQ3ZWE4ZTA2ZjNi ZjJjMTM2Li5lYzQ0OTNlNzM5Njg3ODAyODVjOWQ0MjYxNDViMzE5ZTBiOTA2OWJlIDEwMDY0NAot LS0gYy9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAorKysgdy9Tb3VyY2UvV1RGL3d0 Zi90ZXh0L1N0cmluZ0ltcGwuaApAQCAtMzEsNiArMzEsMTAgQEAKICNpbmNsdWRlIDx3dGYvVmVj dG9yLmg+CiAjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5pY29kZS5oPgogCisjaWYgUExBVEZPUk0o UVQpICYmIEhBVkUoUVQ1KQorI2luY2x1ZGUgPFFTdHJpbmc+CisjZW5kaWYKKwogI2lmIFVTRShD RikKIHR5cGVkZWYgY29uc3Qgc3RydWN0IF9fQ0ZTdHJpbmcgKiBDRlN0cmluZ1JlZjsKICNlbmRp ZgpAQCAtODIsNiArODYsMTAgQEAgcHJpdmF0ZToKICAgICAgICAgQnVmZmVySW50ZXJuYWwsCiAg ICAgICAgIEJ1ZmZlck93bmVkLAogICAgICAgICBCdWZmZXJTdWJzdHJpbmcsCisjaWYgUExBVEZP Uk0oUVQpICYmIEhBVkUoUVQ1KQorICAgICAgICBCdWZmZXJBZG9wdGVkUVN0cmluZworI2VuZGlm CisgICAgICAgIC8vIE5PVEU6IEFkZGluZyBtb3JlIG93bmVyc2hpcCB0eXBlcyBuZWVkcyB0byBl eHRlbmQgbV9oYXNoQW5kRmxhZ3MgYXMgd2UncmUgYXQgY2FwYWNpdHkKICAgICB9OwogCiAgICAg Ly8gVXNlZCB0byBjb25zdHJ1Y3Qgc3RhdGljIHN0cmluZ3MsIHdoaWNoIGhhdmUgYW4gc3BlY2lh bCByZWZDb3VudCB0aGF0IGNhbiBuZXZlciBoaXQgemVyby4KQEAgLTIxNSw2ICsyMjMsMjkgQEAg cHJpdmF0ZToKICAgICAgICAgbV9oYXNoQW5kRmxhZ3MgPSBoYXNoIHwgQnVmZmVySW50ZXJuYWw7 CiAgICAgfQogCisjaWYgUExBVEZPUk0oUVQpICYmIEhBVkUoUVQ1KQorICAgIC8vIFVzZWQgdG8g Y3JlYXRlIG5ldyBzdHJpbmdzIHRoYXQgYWRvcHQgYW4gZXhpc3RpbmcgUVN0cmluZydzIGRhdGEK KyAgICBlbnVtIENvbnN0cnVjdEFkb3B0ZWRRU3RyaW5nVGFnIHsgQ29uc3RydWN0QWRvcHRlZFFT dHJpbmcgfTsKKyAgICBTdHJpbmdJbXBsKFFTdHJpbmdEYXRhKiBxU3RyaW5nRGF0YSwgQ29uc3Ry dWN0QWRvcHRlZFFTdHJpbmdUYWcpCisgICAgICAgIDogbV9yZWZDb3VudChzX3JlZkNvdW50SW5j cmVtZW50KQorICAgICAgICAsIG1fbGVuZ3RoKHFTdHJpbmdEYXRhLT5zaXplKQorICAgICAgICAs IG1fZGF0YTE2KDApCisgICAgICAgICwgbV9xU3RyaW5nRGF0YShxU3RyaW5nRGF0YSkKKyAgICAg ICAgLCBtX2hhc2hBbmRGbGFncyhCdWZmZXJBZG9wdGVkUVN0cmluZykKKyAgICB7CisgICAgICAg IEFTU0VSVChtX2xlbmd0aCk7CisKKyAgICAgICAgLy8gV2UgcmVmIHRoZSBzdHJpbmctZGF0YSB0 byBlbnN1cmUgaXQgd2lsbCBiZSB2YWxpZCBmb3IgdGhlIGxpZmV0aW1lIG9mCisgICAgICAgIC8v IHRoaXMgc3RyaW5nLiBXZSB0aGVuIGRlcmVmIGl0IGluIHRoZSBkZXN0cnVjdG9yLCBzbyB0aGF0 IHRoZSBzdHJpbmcKKyAgICAgICAgLy8gZGF0YSBjYW4gZXZlbnR1YWxseSBiZSBmcmVlZC4KKyAg ICAgICAgbV9xU3RyaW5nRGF0YS0+cmVmLnJlZigpOworCisgICAgICAgIC8vIE5vdyB0aGF0IHdl IGhhdmUgYSByZWYgd2UgY2FuIHNhZmVseSByZWZlcmVuY2UgdGhlIHN0cmluZyBkYXRhCisgICAg ICAgIG1fZGF0YTE2ID0gcmVpbnRlcnByZXRfY2FzdF9wdHI8Y29uc3QgVUNoYXIqPihxU3RyaW5n RGF0YS0+ZGF0YSgpKTsKKyAgICAgICAgQVNTRVJUKG1fZGF0YTE2KTsKKyAgICB9CisjZW5kaWYK KwogcHVibGljOgogICAgIFdURl9FWFBPUlRfUFJJVkFURSB+U3RyaW5nSW1wbCgpOwogCkBAIC0z MDgsNiArMzM5LDEwIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBs PiBhZG9wdChTdHJpbmdCdWZmZXI8TENoYXI+JiBidWZmZXIpOwogICAgIFdURl9FWFBPUlRfUFJJ VkFURSBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZG9wdChTdHJpbmdCdWZmZXI8VUNo YXI+JiBidWZmZXIpOwogCisjaWYgUExBVEZPUk0oUVQpICYmIEhBVkUoUVQ1KQorICAgIHN0YXRp YyBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGFkb3B0KFFTdHJpbmdEYXRhKik7CisjZW5kaWYKKwog ICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVuZ3RoOyB9CiAgICAgYm9v bCBpczhCaXQoKSBjb25zdCB7IHJldHVybiBtX2hhc2hBbmRGbGFncyAmIHNfaGFzaEZsYWc4Qml0 QnVmZmVyOyB9CiAKQEAgLTM2Nyw2ICs0MDIsMTAgQEAgcHVibGljOgogICAgICAgICAgICAgbV9o YXNoQW5kRmxhZ3MgJj0gfnNfaGFzaEZsYWdJc0F0b21pYzsKICAgICB9CiAKKyNpZiBQTEFURk9S TShRVCkgJiYgSEFWRShRVDUpCisgICAgUVN0cmluZ0RhdGEqIHFTdHJpbmdEYXRhKCkgeyByZXR1 cm4gYnVmZmVyT3duZXJzaGlwKCkgPT0gQnVmZmVyQWRvcHRlZFFTdHJpbmcgPyBtX3FTdHJpbmdE YXRhIDogMDsgfQorI2VuZGlmCisKIHByaXZhdGU6CiAgICAgLy8gVGhlIGhpZ2ggYml0cyBvZiAn aGFzaCcgYXJlIGFsd2F5cyBlbXB0eSwgYnV0IHdlIHByZWZlciB0byBzdG9yZSBvdXIgZmxhZ3MK ICAgICAvLyBpbiB0aGUgbG93IGJpdHMgYmVjYXVzZSBpdCBtYWtlcyB0aGVtIHNsaWdodGx5IG1v cmUgZWZmaWNpZW50IHRvIGFjY2Vzcy4KQEAgLTU5MSw2ICs2MzAsOSBAQCBwcml2YXRlOgogICAg ICAgICB2b2lkKiBtX2J1ZmZlcjsKICAgICAgICAgU3RyaW5nSW1wbCogbV9zdWJzdHJpbmdCdWZm ZXI7CiAgICAgICAgIG11dGFibGUgVUNoYXIqIG1fY29weURhdGExNjsKKyNpZiBQTEFURk9STShR VCkgJiYgSEFWRShRVDUpCisgICAgICAgIFFTdHJpbmdEYXRhKiBtX3FTdHJpbmdEYXRhOworI2Vu ZGlmCiAgICAgfTsKICAgICBtdXRhYmxlIHVuc2lnbmVkIG1faGFzaEFuZEZsYWdzOwogfTsK