59127 2011-04-21 12:13:09 -0700 Removed a use of markDOMObjectWrapper: more style- and node-related stuff 2011-04-21 19:16:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren abarth eric oliver webkit.review.bot oldest_to_newest 390237 0 ggaren 2011-04-21 12:13:09 -0700 Removed some custom marking cruft from JSNode 390239 1 90575 ggaren 2011-04-21 12:15:03 -0700 Created attachment 90575 Patch 390245 2 90575 oliver 2011-04-21 12:23:34 -0700 Comment on attachment 90575 Patch r=me 390250 3 90578 ggaren 2011-04-21 12:29:37 -0700 Created attachment 90578 Patch 390251 4 ggaren 2011-04-21 12:29:52 -0700 Oops! Forgot to include a few files in my last patch. 390423 5 90578 oliver 2011-04-21 16:07:29 -0700 Comment on attachment 90578 Patch r=me 390525 6 ggaren 2011-04-21 18:30:56 -0700 Committed r84584: <http://trac.webkit.org/changeset/84584> 390545 7 webkit.review.bot 2011-04-21 19:16:30 -0700 http://trac.webkit.org/changeset/84584 might have broken Qt Linux Release The following tests are not passing: fast/js/Object-create.html 90575 2011-04-21 12:15:03 -0700 2011-04-21 12:29:34 -0700 Patch bug-59127-20110421121502.patch text/plain 8321 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0NTM1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDQtMjEgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHNvbWUgY3VzdG9tIG1hcmtpbmcgY3J1ZnQgZnJv bSBKU05vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU5MTI3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SlNDYW52YXNSZW5kZXJpbmdDb250ZXh0T3duZXI6OmlzUmVhY2hhYmxlRnJvbU9wYXF1 ZVJvb3RzKToKKyAgICAgICAgKFdlYkNvcmU6OkpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dE93bmVy OjpmaW5hbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjp3cmFwcGVyT3duZXIpOgorICAgICAgICAo V2ViQ29yZTo6d3JhcHBlckNvbnRleHQpOiBVc2Ugb3BhcXVlIHJvb3RzIGZvciBtYXJraW5nIGNh bnZhcyByZW5kZXJpbmcKKyAgICAgICAgY29udGV4dHMsIHNvIEpTTm9kZSBpc24ndCByZXNwb25z aWJsZSBmb3IgaXQuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6aXNPYnNlcnZhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OmlzUmVh Y2hhYmxlRnJvbURPTSk6CisgICAgICAgIChXZWJDb3JlOjpKU05vZGVPd25lcjo6aXNSZWFjaGFi bGVGcm9tT3BhcXVlUm9vdHMpOiBSZW1vdmVkIGEgYnVuY2ggb2YKKyAgICAgICAgQ1NTIG9iamVj dCBtb2RlbCByZWxhdGVkIHNwZWNpYWwgY2FzZXMsIHNpbmNlIHRoZSBDU1Mgb2JqZWN0IG1vZGVs CisgICAgICAgIG5vdyB0cmFja3MgaXRzIG93biBsaWZldGltZSB0aHJvdWdoIHRoZSBvcGFxdWUg cm9vdHMgc3lzdGVtLiBSZW1vdmVkCisgICAgICAgIGNhbnZhcyBzcGVjaWFsIGNhc2UsIGNvdmVy ZWQgYWJvdmUuCisKIDIwMTEtMDQtMjEgIE1pa2UgUmVlZCAgPHJlZWRAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ2FudmFzUmVuZGVyaW5nQ29udGV4 dEN1c3RvbS5jcHAJKHJldmlzaW9uIDg0NTM1KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjcsNyArMjcsOSBAQAogI2luY2x1ZGUgIkpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dC5oIgogCiAj aW5jbHVkZSAiQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgiCisjaW5jbHVkZSAiSFRNTENhbnZh c0VsZW1lbnQuaCIKICNpbmNsdWRlICJKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oIgorI2lu Y2x1ZGUgIkpTTm9kZS5oIgogI2lmIEVOQUJMRShXRUJHTCkKICNpbmNsdWRlICJXZWJHTFJlbmRl cmluZ0NvbnRleHQuaCIKICNpbmNsdWRlICJKU1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oIgpAQCAt MzcsNiArMzksMzcgQEAgdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCitjbGFzcyBKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHRPd25lciA6IHB1YmxpYyBKU0M6Oldl YWtIYW5kbGVPd25lciB7CisgICAgdmlydHVhbCBib29sIGlzUmVhY2hhYmxlRnJvbU9wYXF1ZVJv b3RzKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4sIHZvaWQqIGNvbnRleHQsIEpTQzo6TWFya1N0 YWNrJik7CisgICAgdmlydHVhbCB2b2lkIGZpbmFsaXplKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93 bj4sIHZvaWQqIGNvbnRleHQpOworfTsKKworYm9vbCBKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHRP d25lcjo6aXNSZWFjaGFibGVGcm9tT3BhcXVlUm9vdHMoSlNDOjpIYW5kbGU8SlNDOjpVbmtub3du PiBoYW5kbGUsIHZvaWQqLCBNYXJrU3RhY2smIG1hcmtTdGFjaykKK3sKKyAgICBKU0NhbnZhc1Jl bmRlcmluZ0NvbnRleHQqIGpzQ2FudmFzUmVuZGVyaW5nQ29udGV4dCA9IHN0YXRpY19jYXN0PEpT Q2FudmFzUmVuZGVyaW5nQ29udGV4dCo+KGhhbmRsZS5nZXQoKS5hc0NlbGwoKSk7CisgICAgaWYg KCFqc0NhbnZhc1JlbmRlcmluZ0NvbnRleHQtPmhhc0N1c3RvbVByb3BlcnRpZXMoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBtYXJrU3RhY2suY29udGFpbnNPcGFxdWVSb290 KHJvb3QoanNDYW52YXNSZW5kZXJpbmdDb250ZXh0LT5pbXBsKCktPmNhbnZhcygpKSk7Cit9CisK K3ZvaWQgSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0T3duZXI6OmZpbmFsaXplKEpTQzo6SGFuZGxl PEpTQzo6VW5rbm93bj4gaGFuZGxlLCB2b2lkKiBjb250ZXh0KQoreworICAgIEpTQ2FudmFzUmVu ZGVyaW5nQ29udGV4dCoganNDYW52YXNSZW5kZXJpbmdDb250ZXh0ID0gc3RhdGljX2Nhc3Q8SlND YW52YXNSZW5kZXJpbmdDb250ZXh0Kj4oaGFuZGxlLmdldCgpLmFzQ2VsbCgpKTsKKyAgICBET01X cmFwcGVyV29ybGQqIHdvcmxkID0gc3RhdGljX2Nhc3Q8RE9NV3JhcHBlcldvcmxkKj4oY29udGV4 dCk7CisgICAgdW5jYWNoZVdyYXBwZXIod29ybGQsIGpzQ2FudmFzUmVuZGVyaW5nQ29udGV4dC0+ aW1wbCgpLCBqc0NhbnZhc1JlbmRlcmluZ0NvbnRleHQpOworfQorCitpbmxpbmUgSlNDOjpXZWFr SGFuZGxlT3duZXIqIHdyYXBwZXJPd25lcihET01XcmFwcGVyV29ybGQqLCBDYW52YXNSZW5kZXJp bmdDb250ZXh0KikKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEpTQ2FudmFzUmVuZGVyaW5n Q29udGV4dE93bmVyLCBqc0NhbnZhc1JlbmRlcmluZ0NvbnRleHRPd25lciwgKCkpOworICAgIHJl dHVybiAmanNDYW52YXNSZW5kZXJpbmdDb250ZXh0T3duZXI7Cit9CisKK2lubGluZSB2b2lkKiB3 cmFwcGVyQ29udGV4dChET01XcmFwcGVyV29ybGQqIHdvcmxkLCBDYW52YXNSZW5kZXJpbmdDb250 ZXh0KikKK3sKKyAgICByZXR1cm4gd29ybGQ7Cit9CisKIEpTQzo6SlNWYWx1ZSB0b0pTKEpTQzo6 RXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYW52YXNS ZW5kZXJpbmdDb250ZXh0KiBvYmplY3QpCiB7CiAgICAgaWYgKCFvYmplY3QpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5jcHAJKHJldmlzaW9uIDg0NTM1 KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNOb2RlQ3VzdG9tLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtODEsNzMgKzgxLDI2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcg bmFtZXNwYWNlIEhUTUxOYW1lczsKIAotc3RhdGljIGJvb2wgaXNPYnNlcnZhYmxlKEpTTm9kZSog anNOb2RlLCBOb2RlKiBub2RlLCBET01XcmFwcGVyV29ybGQqIHdvcmxkKQorc3RhdGljIGlubGlu ZSBib29sIGlzT2JzZXJ2YWJsZShKU05vZGUqIGpzTm9kZSwgTm9kZSogbm9kZSkKIHsKLSAgICAv LyBDZXJ0YWluIGNvbmRpdGlvbnMgaW1wbGljaXRseSBtYWtlIGV4aXN0ZW5jZSBvZiBhIEpTIERP TSBub2RlIHdyYXBwZXIgb2JzZXJ2YWJsZQotICAgIC8vIHRocm91Z2ggdGhlIERPTSwgZXZlbiBp ZiBubyBleHBsaWNpdCByZWZlcmVuY2UgdG8gaXQgcmVtYWlucy4KLSAgICAKICAgICAvLyBUaGUg RE9NIGRvZXNuJ3Qga25vdyBob3cgdG8ga2VlcCBhIHRyZWUgb2Ygbm9kZXMgYWxpdmUgd2l0aG91 dCB0aGUgcm9vdAogICAgIC8vIGJlaW5nIGV4cGxpY2l0bHkgcmVmZXJlbmNlZC4gU28sIHdlIGFy dGlmaWNpYWxseSB0cmVhdCB0aGUgcm9vdCBvZgogICAgIC8vIGV2ZXJ5IHRyZWUgYXMgb2JzZXJ2 YWJsZS4KLSAgICAvLyBGSVhNRTogUmVzb2x2ZSB0aGlzIGxpZmV0aW1lIGlzc3VlIGluIHRoZSBE T00sIGFuZCByZW1vdmUgdGhpcyBpbmVmZmljaWVuY3kuCisgICAgLy8gRklYTUU6IFJlc29sdmUg dGhpcyBsaWZldGltZSBpc3N1ZSBpbiB0aGUgRE9NLCBhbmQgcmVtb3ZlIHRoaXMuCiAgICAgaWYg KCFub2RlLT5wYXJlbnROb2RlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgLy8gSWYg YSBub2RlIGlzIGluIHRoZSBkb2N1bWVudCwgYW5kIGl0cyB3cmFwcGVyIGhhcyBjdXN0b20gcHJv cGVydGllcywKLSAgICAvLyB0aGUgd3JhcHBlciBpcyBvYnNlcnZhYmxlIGJlY2F1c2UgZnV0dXJl IGFjY2VzcyB0byB0aGUgbm9kZSB0aHJvdWdoIHRoZQotICAgIC8vIERPTSBtdXN0IHJlZmxlY3Qg dGhvc2UgcHJvcGVydGllcy4KICAgICBpZiAoanNOb2RlLT5oYXNDdXN0b21Qcm9wZXJ0aWVzKCkp CiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgLy8gSWYgYSBub2RlIGlzIGluIHRoZSBkb2N1 bWVudCwgYW5kIGhhcyBldmVudCBsaXN0ZW5lcnMsIGl0cyB3cmFwcGVyIGlzCi0gICAgLy8gb2Jz ZXJ2YWJsZSBiZWNhdXNlIGl0cyB3cmFwcGVyIGlzIHJlc3BvbnNpYmxlIGZvciBtYXJraW5nIHRo b3NlIGV2ZW50IGxpc3RlbmVycy4KKyAgICAvLyBBIG5vZGUncyBKUyB3cmFwcGVyIGlzIHJlc3Bv bnNpYmxlIGZvciBtYXJraW5nIGl0cyBKUyBldmVudCBsaXN0ZW5lcnMuCiAgICAgaWYgKG5vZGUt Pmhhc0V2ZW50TGlzdGVuZXJzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgLy8gSWYg YSBub2RlIG93bnMgYW5vdGhlciBvYmplY3Qgd2l0aCBhIHdyYXBwZXIgd2l0aCBjdXN0b20gcHJv cGVydGllcywKLSAgICAvLyB0aGUgd3JhcHBlciBtdXN0IGJlIHRyZWF0ZWQgYXMgb2JzZXJ2YWJs ZSwgYmVjYXVzZSBmdXR1cmUgYWNjZXNzIHRvCi0gICAgLy8gdGhvc2Ugb2JqZWN0cyB0aHJvdWdo IHRoZSBET00gbXVzdCByZWZsZWN0IHRob3NlIHByb3BlcnRpZXMuCi0gICAgLy8gRklYTUU6IEl0 IHdvdWxkIGJlIGJldHRlciBpZiB0aGlzIGxvZ2ljIGNvdWxkIGJlIGluIHRoZSBub2RlIG5leHQg dG8KLSAgICAvLyB0aGUgY3VzdG9tIG1hcmtDaGlsZHJlbiBmdW5jdGlvbnMgcmF0aGVyIHRoYW4g aGVyZS4KLSAgICAvLyBOb3RlIHRoYXQgZm9yIHNvbWUgY29tcG91bmQgb2JqZWN0cyBsaWtlIHN0 eWxlc2hlZXRzIGFuZCBDU1NTdHlsZURlY2xhcmF0aW9ucywKLSAgICAvLyB3ZSBkb24ndCBkZXNj ZW5kIHRvIGNoZWNrIGNoaWxkcmVuIGZvciBjdXN0b20gcHJvcGVydGllcywgYW5kIGp1c3QgY29u c2VydmF0aXZlbHkKLSAgICAvLyBrZWVwIHRoZSBub2RlIHdyYXBwZXJzIHByb3RlY3RpbmcgdGhl bSBhbGl2ZS4KLSAgICBpZiAobm9kZS0+aXNFbGVtZW50Tm9kZSgpKSB7Ci0gICAgICAgIGlmIChu b2RlLT5pc1N0eWxlZEVsZW1lbnQoKSkgewotICAgICAgICAgICAgaWYgKENTU011dGFibGVTdHls ZURlY2xhcmF0aW9uKiBzdHlsZSA9IHN0YXRpY19jYXN0PFN0eWxlZEVsZW1lbnQqPihub2RlKS0+ aW5saW5lU3R5bGVEZWNsKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAod29ybGQtPm1fd3JhcHBl cnMuZ2V0KHN0eWxlKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2Rl KS0+aGFzVGFnTmFtZShjYW52YXNUYWcpKSB7Ci0gICAgICAgICAgICBpZiAoQ2FudmFzUmVuZGVy aW5nQ29udGV4dCogY29udGV4dCA9IHN0YXRpY19jYXN0PEhUTUxDYW52YXNFbGVtZW50Kj4obm9k ZSktPnJlbmRlcmluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAgICAgIGlmIChKU0RPTVdyYXBw ZXIqIHdyYXBwZXIgPSB3b3JsZC0+bV93cmFwcGVycy5nZXQoY29udGV4dCkuZ2V0KCkpIHsKLSAg ICAgICAgICAgICAgICAgICAgaWYgKHdyYXBwZXItPmhhc0N1c3RvbVByb3BlcnRpZXMoKSkKLSAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmIChzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9k ZSktPmhhc1RhZ05hbWUobGlua1RhZykpIHsKLSAgICAgICAgICAgIGlmIChTdHlsZVNoZWV0KiBz aGVldCA9IHN0YXRpY19jYXN0PEhUTUxMaW5rRWxlbWVudCo+KG5vZGUpLT5zaGVldCgpKSB7Ci0g ICAgICAgICAgICAgICAgaWYgKHdvcmxkLT5tX3dyYXBwZXJzLmdldChzaGVldCkpCi0gICAgICAg ICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2Ug aWYgKHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+aGFzVGFnTmFtZShzdHlsZVRhZykpIHsK LSAgICAgICAgICAgIGlmIChTdHlsZVNoZWV0KiBzaGVldCA9IHN0YXRpY19jYXN0PEhUTUxTdHls ZUVsZW1lbnQqPihub2RlKS0+c2hlZXQoKSkgewotICAgICAgICAgICAgICAgIGlmICh3b3JsZC0+ bV93cmFwcGVycy5nZXQoc2hlZXQpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0gZWxzZSBpZiAobm9kZS0+bm9kZVR5cGUo KSA9PSBOb2RlOjpQUk9DRVNTSU5HX0lOU1RSVUNUSU9OX05PREUpIHsKLSAgICAgICAgaWYgKFN0 eWxlU2hlZXQqIHNoZWV0ID0gc3RhdGljX2Nhc3Q8UHJvY2Vzc2luZ0luc3RydWN0aW9uKj4obm9k ZSktPnNoZWV0KCkpIHsKLSAgICAgICAgICAgIGlmICh3b3JsZC0+bV93cmFwcGVycy5nZXQoc2hl ZXQpKQotICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9Ci0gICAgfQotCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgaXNSZWFjaGFibGVGcm9t RE9NKEpTTm9kZSoganNOb2RlLCBOb2RlKiBub2RlLCBET01XcmFwcGVyV29ybGQqIHdvcmxkLCBN YXJrU3RhY2smIG1hcmtTdGFjaykKK3N0YXRpYyBib29sIGlzUmVhY2hhYmxlRnJvbURPTShKU05v ZGUqIGpzTm9kZSwgTm9kZSogbm9kZSwgTWFya1N0YWNrJiBtYXJrU3RhY2spCiB7CiAgICAgaWYg KCFub2RlLT5pbkRvY3VtZW50KCkpIHsKICAgICAgICAgLy8gSWYgYSB3cmFwcGVyIGlzIHRoZSBs YXN0IHJlZmVyZW5jZSB0byBhbiBpbWFnZSBvciBzY3JpcHQgZWxlbWVudApAQCAtMTcwLDE0ICsx MjMsMTMgQEAgc3RhdGljIGlubGluZSBib29sIGlzUmVhY2hhYmxlRnJvbURPTShKUwogICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgcmV0dXJuIGlzT2JzZXJ2YWJsZShqc05v ZGUsIG5vZGUsIHdvcmxkKSAmJiBtYXJrU3RhY2suY29udGFpbnNPcGFxdWVSb290KHJvb3Qobm9k ZSkpOworICAgIHJldHVybiBpc09ic2VydmFibGUoanNOb2RlLCBub2RlKSAmJiBtYXJrU3RhY2su Y29udGFpbnNPcGFxdWVSb290KHJvb3Qobm9kZSkpOwogfQogCi1ib29sIEpTTm9kZU93bmVyOjpp c1JlYWNoYWJsZUZyb21PcGFxdWVSb290cyhKU0M6OkhhbmRsZTxKU0M6OlVua25vd24+IGhhbmRs ZSwgdm9pZCogY29udGV4dCwgTWFya1N0YWNrJiBtYXJrU3RhY2spCitib29sIEpTTm9kZU93bmVy Ojppc1JlYWNoYWJsZUZyb21PcGFxdWVSb290cyhKU0M6OkhhbmRsZTxKU0M6OlVua25vd24+IGhh bmRsZSwgdm9pZCosIE1hcmtTdGFjayYgbWFya1N0YWNrKQogewogICAgIEpTTm9kZSoganNOb2Rl ID0gc3RhdGljX2Nhc3Q8SlNOb2RlKj4oaGFuZGxlLmdldCgpLmFzQ2VsbCgpKTsKLSAgICBET01X cmFwcGVyV29ybGQqIHdvcmxkID0gc3RhdGljX2Nhc3Q8RE9NV3JhcHBlcldvcmxkKj4oY29udGV4 dCk7Ci0gICAgcmV0dXJuIGlzUmVhY2hhYmxlRnJvbURPTShqc05vZGUsIGpzTm9kZS0+aW1wbCgp LCB3b3JsZCwgbWFya1N0YWNrKTsKKyAgICByZXR1cm4gaXNSZWFjaGFibGVGcm9tRE9NKGpzTm9k ZSwganNOb2RlLT5pbXBsKCksIG1hcmtTdGFjayk7CiB9CiAKIHZvaWQgSlNOb2RlT3duZXI6OmZp bmFsaXplKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGFuZGxlLCB2b2lkKiBjb250ZXh0KQo= 90578 2011-04-21 12:29:37 -0700 2011-04-21 16:07:29 -0700 Patch bug-59127-20110421122935.patch text/plain 14928 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0NTM3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMjEgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIGEgdXNlIG9mIG1hcmtET01PYmplY3RXcmFwcGVy OiBtb3JlIHN0eWxlLSBhbmQgbm9kZS1yZWxhdGVkIHN0dWZmCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTEyNworCisgICAgICAgICogYmluZGluZ3Mv anMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dE93bmVyOjppc1JlYWNoYWJsZUZyb21PcGFxdWVSb290 cyk6CisgICAgICAgIChXZWJDb3JlOjpKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHRPd25lcjo6Zmlu YWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6d3JhcHBlck93bmVyKToKKyAgICAgICAgKFdlYkNv cmU6OndyYXBwZXJDb250ZXh0KTogVXNlIG9wYXF1ZSByb290cyBmb3IgbWFya2luZyBjYW52YXMg cmVuZGVyaW5nCisgICAgICAgIGNvbnRleHRzLCBzbyBKU05vZGUgaXNuJ3QgcmVzcG9uc2libGUg Zm9yIGl0LgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNOb2RlQ3VzdG9tLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmlzT2JzZXJ2YWJsZSk6CisgICAgICAgIChXZWJDb3JlOjppc1JlYWNoYWJs ZUZyb21ET00pOgorICAgICAgICAoV2ViQ29yZTo6SlNOb2RlT3duZXI6OmlzUmVhY2hhYmxlRnJv bU9wYXF1ZVJvb3RzKTogUmVtb3ZlZCBhIGJ1bmNoIG9mCisgICAgICAgIENTUyBvYmplY3QgbW9k ZWwgcmVsYXRlZCBzcGVjaWFsIGNhc2VzLCBzaW5jZSB0aGUgQ1NTIG9iamVjdCBtb2RlbAorICAg ICAgICBub3cgdHJhY2tzIGl0cyBvd24gbGlmZXRpbWUgdGhyb3VnaCB0aGUgb3BhcXVlIHJvb3Rz IHN5c3RlbS4gUmVtb3ZlZAorICAgICAgICBjYW52YXMgc3BlY2lhbCBjYXNlLCBjb3ZlcmVkIGFi b3ZlLgorCiAyMDExLTA0LTIxICBNaWtlIFJlZWQgIDxyZWVkQGdvb2dsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpJbmRleDogU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHRDdXN0 b20uY3BwCShyZXZpc2lvbiA4NDUzNykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT Q2FudmFzUmVuZGVyaW5nQ29udGV4dEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcg KzI3LDkgQEAKICNpbmNsdWRlICJKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQuaCIKIAogI2luY2x1 ZGUgIkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oIgorI2luY2x1ZGUgIkhUTUxDYW52YXNFbGVt ZW50LmgiCiAjaW5jbHVkZSAiSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaCIKKyNpbmNsdWRl ICJKU05vZGUuaCIKICNpZiBFTkFCTEUoV0VCR0wpCiAjaW5jbHVkZSAiV2ViR0xSZW5kZXJpbmdD b250ZXh0LmgiCiAjaW5jbHVkZSAiSlNXZWJHTFJlbmRlcmluZ0NvbnRleHQuaCIKQEAgLTM3LDYg KzM5LDM3IEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAor Y2xhc3MgSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0T3duZXIgOiBwdWJsaWMgSlNDOjpXZWFrSGFu ZGxlT3duZXIgeworICAgIHZpcnR1YWwgYm9vbCBpc1JlYWNoYWJsZUZyb21PcGFxdWVSb290cyhK U0M6OkhhbmRsZTxKU0M6OlVua25vd24+LCB2b2lkKiBjb250ZXh0LCBKU0M6Ok1hcmtTdGFjayYp OworICAgIHZpcnR1YWwgdm9pZCBmaW5hbGl6ZShKU0M6OkhhbmRsZTxKU0M6OlVua25vd24+LCB2 b2lkKiBjb250ZXh0KTsKK307CisKK2Jvb2wgSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0T3duZXI6 OmlzUmVhY2hhYmxlRnJvbU9wYXF1ZVJvb3RzKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGFu ZGxlLCB2b2lkKiwgTWFya1N0YWNrJiBtYXJrU3RhY2spCit7CisgICAgSlNDYW52YXNSZW5kZXJp bmdDb250ZXh0KiBqc0NhbnZhc1JlbmRlcmluZ0NvbnRleHQgPSBzdGF0aWNfY2FzdDxKU0NhbnZh c1JlbmRlcmluZ0NvbnRleHQqPihoYW5kbGUuZ2V0KCkuYXNDZWxsKCkpOworICAgIGlmICghanND YW52YXNSZW5kZXJpbmdDb250ZXh0LT5oYXNDdXN0b21Qcm9wZXJ0aWVzKCkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICByZXR1cm4gbWFya1N0YWNrLmNvbnRhaW5zT3BhcXVlUm9vdChyb290 KGpzQ2FudmFzUmVuZGVyaW5nQ29udGV4dC0+aW1wbCgpLT5jYW52YXMoKSkpOworfQorCit2b2lk IEpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dE93bmVyOjpmaW5hbGl6ZShKU0M6OkhhbmRsZTxKU0M6 OlVua25vd24+IGhhbmRsZSwgdm9pZCogY29udGV4dCkKK3sKKyAgICBKU0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQqIGpzQ2FudmFzUmVuZGVyaW5nQ29udGV4dCA9IHN0YXRpY19jYXN0PEpTQ2FudmFz UmVuZGVyaW5nQ29udGV4dCo+KGhhbmRsZS5nZXQoKS5hc0NlbGwoKSk7CisgICAgRE9NV3JhcHBl cldvcmxkKiB3b3JsZCA9IHN0YXRpY19jYXN0PERPTVdyYXBwZXJXb3JsZCo+KGNvbnRleHQpOwor ICAgIHVuY2FjaGVXcmFwcGVyKHdvcmxkLCBqc0NhbnZhc1JlbmRlcmluZ0NvbnRleHQtPmltcGwo KSwganNDYW52YXNSZW5kZXJpbmdDb250ZXh0KTsKK30KKworaW5saW5lIEpTQzo6V2Vha0hhbmRs ZU93bmVyKiB3cmFwcGVyT3duZXIoRE9NV3JhcHBlcldvcmxkKiwgQ2FudmFzUmVuZGVyaW5nQ29u dGV4dCopCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChKU0NhbnZhc1JlbmRlcmluZ0NvbnRl eHRPd25lciwganNDYW52YXNSZW5kZXJpbmdDb250ZXh0T3duZXIsICgpKTsKKyAgICByZXR1cm4g JmpzQ2FudmFzUmVuZGVyaW5nQ29udGV4dE93bmVyOworfQorCitpbmxpbmUgdm9pZCogd3JhcHBl ckNvbnRleHQoRE9NV3JhcHBlcldvcmxkKiB3b3JsZCwgQ2FudmFzUmVuZGVyaW5nQ29udGV4dCop Cit7CisgICAgcmV0dXJuIHdvcmxkOworfQorCiBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNT dGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgQ2FudmFzUmVuZGVy aW5nQ29udGV4dCogb2JqZWN0KQogewogICAgIGlmICghb2JqZWN0KQpJbmRleDogU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNFbGVtZW50Q3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0VsZW1lbnRDdXN0b20uY3BwCShyZXZpc2lvbiA4NDUz NykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRWxlbWVudEN1c3RvbS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTU4LDEyICs1OCw4IEBAIHZvaWQgSlNFbGVtZW50OjptYXJrQ2hpbGRy ZW4oTWFya1N0YWNrJiAKICAgICBFbGVtZW50KiBlbGVtZW50ID0gaW1wbCgpOwogICAgIEpTR2xv YmFsRGF0YSYgZ2xvYmFsRGF0YSA9ICpIZWFwOjpoZWFwKHRoaXMpLT5nbG9iYWxEYXRhKCk7CiAK LSAgICBtYXJrRE9NT2JqZWN0V3JhcHBlcihtYXJrU3RhY2ssIGdsb2JhbERhdGEsIGVsZW1lbnQt PmF0dHJpYnV0ZU1hcCgpKTsKICAgICBtYXJrRE9NT2JqZWN0V3JhcHBlcihtYXJrU3RhY2ssIGds b2JhbERhdGEsIGVsZW1lbnQtPm9wdGlvbmFsQ2xhc3NMaXN0KCkpOwogICAgIG1hcmtET01PYmpl Y3RXcmFwcGVyKG1hcmtTdGFjaywgZ2xvYmFsRGF0YSwgZWxlbWVudC0+b3B0aW9uYWxEYXRhc2V0 KCkpOwotCi0gICAgaWYgKGVsZW1lbnQtPmlzU3R5bGVkRWxlbWVudCgpKQotICAgICAgICBtYXJr RE9NT2JqZWN0V3JhcHBlcihtYXJrU3RhY2ssIGdsb2JhbERhdGEsIHN0YXRpY19jYXN0PFN0eWxl ZEVsZW1lbnQqPihlbGVtZW50KS0+aW5saW5lU3R5bGVEZWNsKCkpOwogfQogCiBKU1ZhbHVlIHRv SlNOZXdseUNyZWF0ZWQoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFs T2JqZWN0LCBFbGVtZW50KiBlbGVtZW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAJKHJldmlzaW9u IDg0NTM3KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVu dEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDE2ICs0MCw2IEBAIHVzaW5nIG5hbWVz cGFjZSBKU0M7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdm9pZCBKU0hUTUxDYW52YXNFbGVt ZW50OjptYXJrQ2hpbGRyZW4oTWFya1N0YWNrJiBtYXJrU3RhY2spCi17Ci0gICAgQmFzZTo6bWFy a0NoaWxkcmVuKG1hcmtTdGFjayk7Ci0KLSAgICBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0g c3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihpbXBsKCkpOwotICAgIEpTR2xvYmFsRGF0 YSYgZ2xvYmFsRGF0YSA9ICpIZWFwOjpoZWFwKHRoaXMpLT5nbG9iYWxEYXRhKCk7Ci0KLSAgICBt YXJrRE9NT2JqZWN0V3JhcHBlcihtYXJrU3RhY2ssIGdsb2JhbERhdGEsIGNhbnZhcy0+cmVuZGVy aW5nQ29udGV4dCgpKTsKLX0KLQogSlNWYWx1ZSBKU0hUTUxDYW52YXNFbGVtZW50OjpnZXRDb250 ZXh0KEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0g c3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihpbXBsKCkpOwpJbmRleDogU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNIVE1MTGlua0VsZW1lbnRDdXN0b20uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTExpbmtFbGVtZW50Q3VzdG9tLmNw cAkocmV2aXNpb24gODQ1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxM aW5rRWxlbWVudEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDEyICszMiw0IEBAIHVz aW5nIG5hbWVzcGFjZSBKU0M7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdm9pZCBKU0hUTUxM aW5rRWxlbWVudDo6bWFya0NoaWxkcmVuKE1hcmtTdGFjayYgbWFya1N0YWNrKQotewotICAgIEJh c2U6Om1hcmtDaGlsZHJlbihtYXJrU3RhY2spOwotCi0gICAgaWYgKFN0eWxlU2hlZXQqIHNoZWV0 ID0gc3RhdGljX2Nhc3Q8SFRNTExpbmtFbGVtZW50Kj4oaW1wbCgpKS0+c2hlZXQoKSkKLSAgICAg ICAgbWFya0RPTU9iamVjdFdyYXBwZXIobWFya1N0YWNrLCAqSGVhcDo6aGVhcCh0aGlzKS0+Z2xv YmFsRGF0YSgpLCBzaGVldCk7Ci19Ci0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTSFRNTFN0eWxlRWxlbWVudEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNIVE1MU3R5bGVFbGVtZW50Q3VzdG9tLmNwcAkocmV2aXNpb24g ODQ1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxTdHlsZUVsZW1lbnRD dXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwxMiArMzIsNCBAQCB1c2luZyBuYW1lc3Bh Y2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXZvaWQgSlNIVE1MU3R5bGVFbGVtZW50 OjptYXJrQ2hpbGRyZW4oTWFya1N0YWNrJiBtYXJrU3RhY2spCi17Ci0gICAgQmFzZTo6bWFya0No aWxkcmVuKG1hcmtTdGFjayk7Ci0KLSAgICBpZiAoU3R5bGVTaGVldCogc2hlZXQgPSBzdGF0aWNf Y2FzdDxIVE1MU3R5bGVFbGVtZW50Kj4oaW1wbCgpKS0+c2hlZXQoKSkKLSAgICAgICAgbWFya0RP TU9iamVjdFdyYXBwZXIobWFya1N0YWNrLCAqSGVhcDo6aGVhcCh0aGlzKS0+Z2xvYmFsRGF0YSgp LCBzaGVldCk7Ci19Ci0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9k ZUN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNO b2RlQ3VzdG9tLmNwcAkocmV2aXNpb24gODQ1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU05vZGVDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSw3MyArODEsMjYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCi1zdGF0 aWMgYm9vbCBpc09ic2VydmFibGUoSlNOb2RlKiBqc05vZGUsIE5vZGUqIG5vZGUsIERPTVdyYXBw ZXJXb3JsZCogd29ybGQpCitzdGF0aWMgaW5saW5lIGJvb2wgaXNPYnNlcnZhYmxlKEpTTm9kZSog anNOb2RlLCBOb2RlKiBub2RlKQogewotICAgIC8vIENlcnRhaW4gY29uZGl0aW9ucyBpbXBsaWNp dGx5IG1ha2UgZXhpc3RlbmNlIG9mIGEgSlMgRE9NIG5vZGUgd3JhcHBlciBvYnNlcnZhYmxlCi0g ICAgLy8gdGhyb3VnaCB0aGUgRE9NLCBldmVuIGlmIG5vIGV4cGxpY2l0IHJlZmVyZW5jZSB0byBp dCByZW1haW5zLgotICAgIAogICAgIC8vIFRoZSBET00gZG9lc24ndCBrbm93IGhvdyB0byBrZWVw IGEgdHJlZSBvZiBub2RlcyBhbGl2ZSB3aXRob3V0IHRoZSByb290CiAgICAgLy8gYmVpbmcgZXhw bGljaXRseSByZWZlcmVuY2VkLiBTbywgd2UgYXJ0aWZpY2lhbGx5IHRyZWF0IHRoZSByb290IG9m CiAgICAgLy8gZXZlcnkgdHJlZSBhcyBvYnNlcnZhYmxlLgotICAgIC8vIEZJWE1FOiBSZXNvbHZl IHRoaXMgbGlmZXRpbWUgaXNzdWUgaW4gdGhlIERPTSwgYW5kIHJlbW92ZSB0aGlzIGluZWZmaWNp ZW5jeS4KKyAgICAvLyBGSVhNRTogUmVzb2x2ZSB0aGlzIGxpZmV0aW1lIGlzc3VlIGluIHRoZSBE T00sIGFuZCByZW1vdmUgdGhpcy4KICAgICBpZiAoIW5vZGUtPnBhcmVudE5vZGUoKSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAKLSAgICAvLyBJZiBhIG5vZGUgaXMgaW4gdGhlIGRvY3VtZW50LCBh bmQgaXRzIHdyYXBwZXIgaGFzIGN1c3RvbSBwcm9wZXJ0aWVzLAotICAgIC8vIHRoZSB3cmFwcGVy IGlzIG9ic2VydmFibGUgYmVjYXVzZSBmdXR1cmUgYWNjZXNzIHRvIHRoZSBub2RlIHRocm91Z2gg dGhlCi0gICAgLy8gRE9NIG11c3QgcmVmbGVjdCB0aG9zZSBwcm9wZXJ0aWVzLgogICAgIGlmIChq c05vZGUtPmhhc0N1c3RvbVByb3BlcnRpZXMoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAg ICAvLyBJZiBhIG5vZGUgaXMgaW4gdGhlIGRvY3VtZW50LCBhbmQgaGFzIGV2ZW50IGxpc3RlbmVy cywgaXRzIHdyYXBwZXIgaXMKLSAgICAvLyBvYnNlcnZhYmxlIGJlY2F1c2UgaXRzIHdyYXBwZXIg aXMgcmVzcG9uc2libGUgZm9yIG1hcmtpbmcgdGhvc2UgZXZlbnQgbGlzdGVuZXJzLgorICAgIC8v IEEgbm9kZSdzIEpTIHdyYXBwZXIgaXMgcmVzcG9uc2libGUgZm9yIG1hcmtpbmcgaXRzIEpTIGV2 ZW50IGxpc3RlbmVycy4KICAgICBpZiAobm9kZS0+aGFzRXZlbnRMaXN0ZW5lcnMoKSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAKLSAgICAvLyBJZiBhIG5vZGUgb3ducyBhbm90aGVyIG9iamVjdCB3 aXRoIGEgd3JhcHBlciB3aXRoIGN1c3RvbSBwcm9wZXJ0aWVzLAotICAgIC8vIHRoZSB3cmFwcGVy IG11c3QgYmUgdHJlYXRlZCBhcyBvYnNlcnZhYmxlLCBiZWNhdXNlIGZ1dHVyZSBhY2Nlc3MgdG8K LSAgICAvLyB0aG9zZSBvYmplY3RzIHRocm91Z2ggdGhlIERPTSBtdXN0IHJlZmxlY3QgdGhvc2Ug cHJvcGVydGllcy4KLSAgICAvLyBGSVhNRTogSXQgd291bGQgYmUgYmV0dGVyIGlmIHRoaXMgbG9n aWMgY291bGQgYmUgaW4gdGhlIG5vZGUgbmV4dCB0bwotICAgIC8vIHRoZSBjdXN0b20gbWFya0No aWxkcmVuIGZ1bmN0aW9ucyByYXRoZXIgdGhhbiBoZXJlLgotICAgIC8vIE5vdGUgdGhhdCBmb3Ig c29tZSBjb21wb3VuZCBvYmplY3RzIGxpa2Ugc3R5bGVzaGVldHMgYW5kIENTU1N0eWxlRGVjbGFy YXRpb25zLAotICAgIC8vIHdlIGRvbid0IGRlc2NlbmQgdG8gY2hlY2sgY2hpbGRyZW4gZm9yIGN1 c3RvbSBwcm9wZXJ0aWVzLCBhbmQganVzdCBjb25zZXJ2YXRpdmVseQotICAgIC8vIGtlZXAgdGhl IG5vZGUgd3JhcHBlcnMgcHJvdGVjdGluZyB0aGVtIGFsaXZlLgotICAgIGlmIChub2RlLT5pc0Vs ZW1lbnROb2RlKCkpIHsKLSAgICAgICAgaWYgKG5vZGUtPmlzU3R5bGVkRWxlbWVudCgpKSB7Ci0g ICAgICAgICAgICBpZiAoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gc3RhdGlj X2Nhc3Q8U3R5bGVkRWxlbWVudCo+KG5vZGUpLT5pbmxpbmVTdHlsZURlY2woKSkgewotICAgICAg ICAgICAgICAgIGlmICh3b3JsZC0+bV93cmFwcGVycy5nZXQoc3R5bGUpKQotICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICBp ZiAoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpLT5oYXNUYWdOYW1lKGNhbnZhc1RhZykpIHsK LSAgICAgICAgICAgIGlmIChDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0ID0gc3RhdGlj X2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihub2RlKS0+cmVuZGVyaW5nQ29udGV4dCgpKSB7Ci0g ICAgICAgICAgICAgICAgaWYgKEpTRE9NV3JhcHBlciogd3JhcHBlciA9IHdvcmxkLT5tX3dyYXBw ZXJzLmdldChjb250ZXh0KS5nZXQoKSkgewotICAgICAgICAgICAgICAgICAgICBpZiAod3JhcHBl ci0+aGFzQ3VzdG9tUHJvcGVydGllcygpKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2Ug aWYgKHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+aGFzVGFnTmFtZShsaW5rVGFnKSkgewot ICAgICAgICAgICAgaWYgKFN0eWxlU2hlZXQqIHNoZWV0ID0gc3RhdGljX2Nhc3Q8SFRNTExpbmtF bGVtZW50Kj4obm9kZSktPnNoZWV0KCkpIHsKLSAgICAgICAgICAgICAgICBpZiAod29ybGQtPm1f d3JhcHBlcnMuZ2V0KHNoZWV0KSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5v ZGUpLT5oYXNUYWdOYW1lKHN0eWxlVGFnKSkgewotICAgICAgICAgICAgaWYgKFN0eWxlU2hlZXQq IHNoZWV0ID0gc3RhdGljX2Nhc3Q8SFRNTFN0eWxlRWxlbWVudCo+KG5vZGUpLT5zaGVldCgpKSB7 Ci0gICAgICAgICAgICAgICAgaWYgKHdvcmxkLT5tX3dyYXBwZXJzLmdldChzaGVldCkpCi0gICAg ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0g ICAgfSBlbHNlIGlmIChub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OlBST0NFU1NJTkdfSU5TVFJV Q1RJT05fTk9ERSkgewotICAgICAgICBpZiAoU3R5bGVTaGVldCogc2hlZXQgPSBzdGF0aWNfY2Fz dDxQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24qPihub2RlKS0+c2hlZXQoKSkgewotICAgICAgICAgICAg aWYgKHdvcmxkLT5tX3dyYXBwZXJzLmdldChzaGVldCkpCi0gICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRp YyBpbmxpbmUgYm9vbCBpc1JlYWNoYWJsZUZyb21ET00oSlNOb2RlKiBqc05vZGUsIE5vZGUqIG5v ZGUsIERPTVdyYXBwZXJXb3JsZCogd29ybGQsIE1hcmtTdGFjayYgbWFya1N0YWNrKQorc3RhdGlj IGJvb2wgaXNSZWFjaGFibGVGcm9tRE9NKEpTTm9kZSoganNOb2RlLCBOb2RlKiBub2RlLCBNYXJr U3RhY2smIG1hcmtTdGFjaykKIHsKICAgICBpZiAoIW5vZGUtPmluRG9jdW1lbnQoKSkgewogICAg ICAgICAvLyBJZiBhIHdyYXBwZXIgaXMgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIGFuIGltYWdlIG9y IHNjcmlwdCBlbGVtZW50CkBAIC0xNzAsMTQgKzEyMywxMyBAQCBzdGF0aWMgaW5saW5lIGJvb2wg aXNSZWFjaGFibGVGcm9tRE9NKEpTCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAK LSAgICByZXR1cm4gaXNPYnNlcnZhYmxlKGpzTm9kZSwgbm9kZSwgd29ybGQpICYmIG1hcmtTdGFj ay5jb250YWluc09wYXF1ZVJvb3Qocm9vdChub2RlKSk7CisgICAgcmV0dXJuIGlzT2JzZXJ2YWJs ZShqc05vZGUsIG5vZGUpICYmIG1hcmtTdGFjay5jb250YWluc09wYXF1ZVJvb3Qocm9vdChub2Rl KSk7CiB9CiAKLWJvb2wgSlNOb2RlT3duZXI6OmlzUmVhY2hhYmxlRnJvbU9wYXF1ZVJvb3RzKEpT Qzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGFuZGxlLCB2b2lkKiBjb250ZXh0LCBNYXJrU3RhY2sm IG1hcmtTdGFjaykKK2Jvb2wgSlNOb2RlT3duZXI6OmlzUmVhY2hhYmxlRnJvbU9wYXF1ZVJvb3Rz KEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGFuZGxlLCB2b2lkKiwgTWFya1N0YWNrJiBtYXJr U3RhY2spCiB7CiAgICAgSlNOb2RlKiBqc05vZGUgPSBzdGF0aWNfY2FzdDxKU05vZGUqPihoYW5k bGUuZ2V0KCkuYXNDZWxsKCkpOwotICAgIERPTVdyYXBwZXJXb3JsZCogd29ybGQgPSBzdGF0aWNf Y2FzdDxET01XcmFwcGVyV29ybGQqPihjb250ZXh0KTsKLSAgICByZXR1cm4gaXNSZWFjaGFibGVG cm9tRE9NKGpzTm9kZSwganNOb2RlLT5pbXBsKCksIHdvcmxkLCBtYXJrU3RhY2spOworICAgIHJl dHVybiBpc1JlYWNoYWJsZUZyb21ET00oanNOb2RlLCBqc05vZGUtPmltcGwoKSwgbWFya1N0YWNr KTsKIH0KIAogdm9pZCBKU05vZGVPd25lcjo6ZmluYWxpemUoSlNDOjpIYW5kbGU8SlNDOjpVbmtu b3duPiBoYW5kbGUsIHZvaWQqIGNvbnRleHQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU1Byb2Nlc3NpbmdJbnN0cnVjdGlvbkN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNQcm9jZXNzaW5nSW5zdHJ1Y3Rpb25DdXN0b20uY3Bw CShyZXZpc2lvbiA4NDUzNykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUHJvY2Vz c2luZ0luc3RydWN0aW9uQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsMTIgKzMyLDQg QEAgdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi12b2lkIEpT UHJvY2Vzc2luZ0luc3RydWN0aW9uOjptYXJrQ2hpbGRyZW4oTWFya1N0YWNrJiBtYXJrU3RhY2sp Ci17Ci0gICAgQmFzZTo6bWFya0NoaWxkcmVuKG1hcmtTdGFjayk7Ci0KLSAgICBpZiAoU3R5bGVT aGVldCogc2hlZXQgPSBzdGF0aWNfY2FzdDxQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24qPihpbXBsKCkp LT5zaGVldCgpKQotICAgICAgICBtYXJrRE9NT2JqZWN0V3JhcHBlcihtYXJrU3RhY2ssICpIZWFw OjpoZWFwKHRoaXMpLT5nbG9iYWxEYXRhKCksIHNoZWV0KTsKLX0KLQogfQpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNXZWJLaXRBbmltYXRpb25MaXN0Q3VzdG9tLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dlYktpdEFuaW1hdGlvbkxp c3RDdXN0b20uY3BwCShyZXZpc2lvbiA4NDUzNykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTV2ViS2l0QW5pbWF0aW9uTGlzdEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMy LDE2ICszMiw0IEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotdm9pZCBKU1dlYktpdEFuaW1hdGlvbkxpc3Q6Om1hcmtDaGlsZHJlbihNYXJrU3RhY2smIG1h cmtTdGFjaykKLXsKLSAgICBCYXNlOjptYXJrQ2hpbGRyZW4obWFya1N0YWNrKTsKLQotICAgIFdl YktpdEFuaW1hdGlvbkxpc3QqIGxpc3QgPSBpbXBsKCk7Ci0gICAgSlNHbG9iYWxEYXRhJiBnbG9i YWxEYXRhID0gKkhlYXA6OmhlYXAodGhpcyktPmdsb2JhbERhdGEoKTsKLQotICAgIHVuc2lnbmVk IGxlbmd0aCA9IGxpc3QtPmxlbmd0aCgpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBs ZW5ndGg7ICsraSkKLSAgICAgICAgbWFya0RPTU9iamVjdFdyYXBwZXIobWFya1N0YWNrLCBnbG9i YWxEYXRhLCBsaXN0LT5pdGVtKGkpKTsKLX0KLQogfQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L1Byb2Nlc3NpbmdJbnN0cnVjdGlvbi5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL1Byb2Nlc3NpbmdJbnN0cnVjdGlvbi5pZGwJKHJldmlzaW9uIDg0NTM3KQorKysgU291cmNl L1dlYkNvcmUvZG9tL1Byb2Nlc3NpbmdJbnN0cnVjdGlvbi5pZGwJKHdvcmtpbmcgY29weSkKQEAg LTIwLDcgKzIwLDcgQEAKIAogbW9kdWxlIGNvcmUgewogCi0gICAgaW50ZXJmYWNlIFtDdXN0b21N YXJrRnVuY3Rpb25dIFByb2Nlc3NpbmdJbnN0cnVjdGlvbiA6IE5vZGUgeworICAgIGludGVyZmFj ZSBQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24gOiBOb2RlIHsKIAogICAgICAgICAvLyBET00gTGV2ZWwg MQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmlkbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmlkbAkocmV2 aXNpb24gODQ1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50Lmlk bAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNiBAQAogbW9kdWxlIGh0bWwgewogCiAgICAg aW50ZXJmYWNlIFsKLSAgICAgICAgQ3VzdG9tTWFya0Z1bmN0aW9uLAogICAgICAgICBHZW5lcmF0 ZU5hdGl2ZUNvbnZlcnRlcgogICAgIF0gSFRNTENhbnZhc0VsZW1lbnQgOiBIVE1MRWxlbWVudCB7 CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExpbmtFbGVtZW50LmlkbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5pZGwJKHJldmlzaW9u IDg0NTM3KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuaWRsCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw3IEBACiAKIG1vZHVsZSBodG1sIHsKIAotICAgIGludGVy ZmFjZSBbQ3VzdG9tTWFya0Z1bmN0aW9uXSBIVE1MTGlua0VsZW1lbnQgOiBIVE1MRWxlbWVudCB7 CisgICAgaW50ZXJmYWNlIEhUTUxMaW5rRWxlbWVudCA6IEhUTUxFbGVtZW50IHsKICAgICAgICAg YXR0cmlidXRlIGJvb2xlYW4gZGlzYWJsZWQ7CiAgICAgICAgIGF0dHJpYnV0ZSBbUmVmbGVjdF0g RE9NU3RyaW5nIGNoYXJzZXQ7CiAgICAgICAgIGF0dHJpYnV0ZSBbUmVmbGVjdCwgVVJMXSBET01T dHJpbmcgaHJlZjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVudC5p ZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50Lmlk bAkocmV2aXNpb24gODQ1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1l bnQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw3IEBACiAKIG1vZHVsZSBodG1sIHsK IAotICAgIGludGVyZmFjZSBbQ3VzdG9tTWFya0Z1bmN0aW9uXSBIVE1MU3R5bGVFbGVtZW50IDog SFRNTEVsZW1lbnQgeworICAgIGludGVyZmFjZSBIVE1MU3R5bGVFbGVtZW50IDogSFRNTEVsZW1l bnQgewogICAgICAgICBhdHRyaWJ1dGUgYm9vbGVhbiBkaXNhYmxlZDsKICAgICAgICAgYXR0cmli dXRlIFtSZWZsZWN0XSBET01TdHJpbmcgbWVkaWE7CiAgICAgICAgIGF0dHJpYnV0ZSBbUmVmbGVj dF0gRE9NU3RyaW5nIHR5cGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1dlYktpdEFuaW1h dGlvbkxpc3QuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvV2ViS2l0QW5p bWF0aW9uTGlzdC5pZGwJKHJldmlzaW9uIDg0NTM3KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9X ZWJLaXRBbmltYXRpb25MaXN0LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAog bW9kdWxlIGh0bWwgewogCiAgICAgaW50ZXJmYWNlIFsKLSAgICAgICAgQ3VzdG9tTWFya0Z1bmN0 aW9uLAogICAgICAgICBIYXNJbmRleEdldHRlcgogICAgIF0gV2ViS2l0QW5pbWF0aW9uTGlzdCB7 CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxlbmd0aDsK