58596 2011-04-14 16:02:37 -0700 WK2: Past searches not remembered for <input type=search results="5" autosave="foo"> 2011-04-15 12:25:34 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson oldest_to_newest 386146 0 beidson 2011-04-14 16:02:37 -0700 Past searches not remembered for <input type=search results="5"> in WebKit2. In radar as <rdar://problem/9287880> 386741 1 89810 beidson 2011-04-15 10:49:18 -0700 Created attachment 89810 Patch v1 386809 2 89810 mitz 2011-04-15 12:11:34 -0700 Comment on attachment 89810 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=89810&action=review > Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp:191 > + // The WebProcess shouldnt have bothered to send this message if the name was empty. Typo: shouldnt. > Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp:197 > + size_t size = searchItems.size(); > + if (size) { size can be defined inside the if(). > Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp:211 > + // The WebProcess shouldnt have bothered to send this message if the name was empty. Same typo!! 386818 3 beidson 2011-04-15 12:25:34 -0700 r84011 89810 2011-04-15 10:49:18 -0700 2011-04-15 12:11:34 -0700 Patch v1 patch.txt text/plain 9053 beidson SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzOTkwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDQtMTUgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85Mjg3ODgwPiBhbmQgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4NTk2CisgICAgICAgIFdLMjogUGFzdCBz ZWFyY2hlcyBub3QgcmVtZW1iZXJlZCBmb3IgPGlucHV0IHR5cGU9c2VhcmNoIHJlc3VsdHM9IjUi IGF1dG9zYXZlPSJmb28iPgorCisgICAgICAgIEFkZCBTYXZlUmVjZW50U2VhcmNoZXMgYW5kIExv YWRSZWNlbnRTZWFyY2hlcyBtZXNzYWdlczoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKwor ICAgICAgICBNZXNzYWdlIHVwIHRvIHRoZSBVSVByb2Nlc3MgZm9yIHRoZSBzYXZlL2xvYWQgb3Bl cmF0aW9uczoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNlYXJjaFBv cHVwTWVudS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNlYXJjaFBvcHVwTWVudTo6c2F2ZVJl Y2VudFNlYXJjaGVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViU2VhcmNoUG9wdXBNZW51Ojpsb2Fk UmVjZW50U2VhcmNoZXMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi UG9wdXBNZW51Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudTo6cGFnZSk6CisKKyAg ICAgICAgU2F2ZSB0aGUgdmFsdWVzIHRvIGRpc2sgQ0ZQcmVmZXJlbmNlLXN0eWxlOgorICAgICAg ICAqIFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHA6CisgICAgICAgIChXZWJLaXQ6OmF1 dG9zYXZlS2V5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUmVjZW50U2Vh cmNoZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRSZWNlbnRTZWFyY2hl cyk6CisKKyAgICAgICAgU3R1YmJlZCBvdXQgZm9yIG5vbi1DRiBwbGF0Zm9ybXM6CisgICAgICAg ICogVUlQcm9jZXNzL2d0ay9XZWJQYWdlUHJveHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnNhdmVSZWNlbnRTZWFyY2hlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6bG9hZFJlY2VudFNlYXJjaGVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvV2Vi UGFnZVByb3h5UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNhdmVSZWNl bnRTZWFyY2hlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlY2VudFNl YXJjaGVzKToKKwogMjAxMS0wNC0xNSAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4Mzk3NSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNjI1LDYgKzYy NSwxMCBAQCBwcml2YXRlOgogICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IENvbnRleHRNZW51U3RhdGUmLCBjb25zdCBW ZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mLCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIq KTsKICAgICB2b2lkIGludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBtZW51TG9jYXRpb24sIGNvbnN0IENvbnRleHRNZW51U3RhdGUmLCBjb25zdCBWZWN0b3I8 V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mLCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqKTsKIAor ICAgIC8vIFNlYXJjaCBwb3B1cCByZXN1bHRzCisgICAgdm9pZCBzYXZlUmVjZW50U2VhcmNoZXMo Y29uc3QgU3RyaW5nJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mKTsKKyAgICB2b2lkIGxvYWRSZWNl bnRTZWFyY2hlcyhjb25zdCBTdHJpbmcmLCBWZWN0b3I8U3RyaW5nPiYpOworCiAjaWYgUExBVEZP Uk0oTUFDKQogICAgIC8vIFNwZWVjaC4KICAgICB2b2lkIGdldElzU3BlYWtpbmcoYm9vbCYpOwpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh Z2VzLmluCShyZXZpc2lvbiA4Mzk3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTIzOCw0ICsyMzgsOCBAQCBt ZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgICMgV2luZG93cyA3IEdlc3R1cmUgTWVzc2Fn ZXMKICAgICBTZXRHZXN0dXJlUmVhY2hlZFNjcm9sbGluZ0xpbWl0KGJvb2wgbGltaXRSZWFjaGVk KQogI2VuZGlmCisKKyAgICAjIFNlYXJjaCBwb3B1cCBtZW51cworICAgIFNhdmVSZWNlbnRTZWFy Y2hlcyhXVEY6OlN0cmluZyBuYW1lLCBWZWN0b3I8U3RyaW5nPiBzZWFyY2hJdGVtcykKKyAgICBM b2FkUmVjZW50U2VhcmNoZXMoV1RGOjpTdHJpbmcgbmFtZSkgLT4gKFZlY3RvcjxTdHJpbmc+IHJl c3VsdCkKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlD Ri5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQ cm94eUNGLmNwcAkocmV2aXNpb24gODM5NzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Y2YvV2ViUGFnZVByb3h5Q0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODAsNCArMTgwLDQ5IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpyZXN0b3JlRnJvbVNlc3Npb25TdGEKICAgICAgICAgbG9hZFVS TChwcm92aXNpb25hbFVSTCk7CiB9CiAKK3N0YXRpYyBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGF1 dG9zYXZlS2V5KGNvbnN0IFN0cmluZyYgbmFtZSkKK3sKKyAgICBTdHJpbmcga2V5ID0gImNvbS5h cHBsZS5XZWJLaXQuc2VhcmNoRmllbGQ6IiArIG5hbWU7CisgICAgcmV0dXJuIFJldGFpblB0cjxD RlN0cmluZ1JlZj4oQWRvcHRDRiwga2V5LmNyZWF0ZUNGU3RyaW5nKCkpOworfQorCit2b2lkIFdl YlBhZ2VQcm94eTo6c2F2ZVJlY2VudFNlYXJjaGVzKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3Qg VmVjdG9yPFN0cmluZz4mIHNlYXJjaEl0ZW1zKQoreworICAgIC8vIFRoZSBXZWJQcm9jZXNzIHNo b3VsZG50IGhhdmUgYm90aGVyZWQgdG8gc2VuZCB0aGlzIG1lc3NhZ2UgaWYgdGhlIG5hbWUgd2Fz IGVtcHR5LgorICAgIEFTU0VSVCghbmFtZS5pc0VtcHR5KCkpOworCisgICAgUmV0YWluUHRyPENG TXV0YWJsZUFycmF5UmVmPiBpdGVtczsKKworICAgIHNpemVfdCBzaXplID0gc2VhcmNoSXRlbXMu c2l6ZSgpOworICAgIGlmIChzaXplKSB7CisgICAgICAgIGl0ZW1zLmFkb3B0Q0YoQ0ZBcnJheUNy ZWF0ZU11dGFibGUoMCwgc2l6ZSwgJmtDRlR5cGVBcnJheUNhbGxCYWNrcykpOworICAgICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkgeworICAgICAgICAgICAgUmV0YWluUHRy PENGU3RyaW5nUmVmPiBpdGVtKEFkb3B0Q0YsIHNlYXJjaEl0ZW1zW2ldLmNyZWF0ZUNGU3RyaW5n KCkpOworICAgICAgICAgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGl0ZW1zLmdldCgpLCBpdGVtLmdl dCgpKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIENGUHJlZmVyZW5jZXNTZXRBcHBWYWx1ZShh dXRvc2F2ZUtleShuYW1lKS5nZXQoKSwgaXRlbXMuZ2V0KCksIGtDRlByZWZlcmVuY2VzQ3VycmVu dEFwcGxpY2F0aW9uKTsKKyAgICBDRlByZWZlcmVuY2VzQXBwU3luY2hyb25pemUoa0NGUHJlZmVy ZW5jZXNDdXJyZW50QXBwbGljYXRpb24pOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJl Y2VudFNlYXJjaGVzKGNvbnN0IFN0cmluZyYgbmFtZSwgVmVjdG9yPFN0cmluZz4mIHNlYXJjaEl0 ZW1zKQoreworICAgIC8vIFRoZSBXZWJQcm9jZXNzIHNob3VsZG50IGhhdmUgYm90aGVyZWQgdG8g c2VuZCB0aGlzIG1lc3NhZ2UgaWYgdGhlIG5hbWUgd2FzIGVtcHR5LgorICAgIEFTU0VSVCghbmFt ZS5pc0VtcHR5KCkpOworCisgICAgc2VhcmNoSXRlbXMuY2xlYXIoKTsKKyAgICBSZXRhaW5QdHI8 Q0ZBcnJheVJlZj4gaXRlbXMoQWRvcHRDRiwgcmVpbnRlcnByZXRfY2FzdDxDRkFycmF5UmVmPihD RlByZWZlcmVuY2VzQ29weUFwcFZhbHVlKGF1dG9zYXZlS2V5KG5hbWUpLmdldCgpLCBrQ0ZQcmVm ZXJlbmNlc0N1cnJlbnRBcHBsaWNhdGlvbikpKTsKKworICAgIGlmICghaXRlbXMgfHwgQ0ZHZXRU eXBlSUQoaXRlbXMuZ2V0KCkpICE9IENGQXJyYXlHZXRUeXBlSUQoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgc2l6ZV90IHNpemUgPSBDRkFycmF5R2V0Q291bnQoaXRlbXMuZ2V0KCkpOworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAgIENGU3RyaW5nUmVm IGl0ZW0gPSAoQ0ZTdHJpbmdSZWYpQ0ZBcnJheUdldFZhbHVlQXRJbmRleChpdGVtcy5nZXQoKSwg aSk7CisgICAgICAgIGlmIChDRkdldFR5cGVJRChpdGVtKSA9PSBDRlN0cmluZ0dldFR5cGVJRCgp KQorICAgICAgICAgICAgc2VhcmNoSXRlbXMuYXBwZW5kKGl0ZW0pOworICAgIH0KK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dl YlBhZ2VQcm94eUd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2d0ay9XZWJQYWdlUHJveHlHdGsuY3BwCShyZXZpc2lvbiA4Mzk3NSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgogCiAjaW5jbHVkZSAiTmF0 aXZlV2ViS2V5Ym9hcmRFdmVudC5oIgorI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5j bHVkZSAiUGFnZUNsaWVudC5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQzLDQgKzQ0LDE0 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRFZGl0b3JDb21tYW5kc0ZvcksKICAgICBtX3BhZ2VD bGllbnQtPmdldEVkaXRvckNvbW1hbmRzRm9yS2V5RXZlbnQobV9rZXlFdmVudFF1ZXVlLmZpcnN0 KCksIGNvbW1hbmRzTGlzdCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUmVjZW50U2Vh cmNoZXMoY29uc3QgU3RyaW5nJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mKQoreworICAgIG5vdElt cGxlbWVudGVkKCk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVjZW50U2VhcmNoZXMo Y29uc3QgU3RyaW5nJiwgVmVjdG9yPFN0cmluZz4mKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1dlYlBhZ2VQcm94eVF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvV2ViUGFnZVByb3h5UXQuY3BwCShyZXZpc2lvbiA4Mzk3NSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQYWdlUHJveHlRdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI2LDYgKzI2LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJQYWdl UHJveHkuaCIKIAorI2luY2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KKwogbmFtZXNw YWNlIFdlYktpdCB7CiAKIFN0cmluZyBXZWJQYWdlUHJveHk6OnN0YW5kYXJkVXNlckFnZW50KGNv bnN0IFN0cmluZyYgYXBwbGljYXRpb25OYW1lRm9yVXNlckFnZW50KQpAQCAtMzQsNCArMzYsMTQg QEAgU3RyaW5nIFdlYlBhZ2VQcm94eTo6c3RhbmRhcmRVc2VyQWdlbnQoYwogICAgIHJldHVybiAi TW96aWxsYS81LjAgKE1hY2ludG9zaDsgSW50ZWwgTWFjIE9TIFggMTBfNikgQXBwbGVXZWJLaXQv NTMxLjQgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLzQuMC4zIFNhZmFyaS81MzEuNCI7CiB9 CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUmVjZW50U2VhcmNoZXMoY29uc3QgU3RyaW5nJiwg Y29uc3QgVmVjdG9yPFN0cmluZz4mKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKK3Zv aWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVjZW50U2VhcmNoZXMoY29uc3QgU3RyaW5nJiwgVmVjdG9y PFN0cmluZz4mKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJQb3B1cE1lbnUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYlBvcHVwTWVudS5oCShyZXZpc2lvbiA4Mzk3NSkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUG9wdXBNZW51LmgJKHdvcmtpbmcg Y29weSkKQEAgLTQzLDYgKzQzLDggQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdl YlBvcHVwTWVudT4gY3JlYXRlKFdlYlBhZ2UqLCBXZWJDb3JlOjpQb3B1cE1lbnVDbGllbnQqKTsK ICAgICB+V2ViUG9wdXBNZW51KCk7CiAKKyAgICBXZWJQYWdlKiBwYWdlKCkgeyByZXR1cm4gbV9w YWdlOyB9CisKICAgICB2b2lkIGRpc2Nvbm5lY3RGcm9tUGFnZSgpIHsgbV9wYWdlID0gMDsgfQog ICAgIHZvaWQgZGlkQ2hhbmdlU2VsZWN0ZWRJbmRleChpbnQgbmV3SW5kZXgpOwogICAgIHZvaWQg c2V0VGV4dEZvckluZGV4KGludCBuZXdJbmRleCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNlYXJjaFBvcHVwTWVudS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJTZWFyY2hQb3B1 cE1lbnUuY3BwCShyZXZpc2lvbiA4Mzk3NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViU2VhcmNoUG9wdXBNZW51LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjMsNiArMjMsMTEgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJTZWFyY2hQ b3B1cE1lbnUuaCIKIAorI2luY2x1ZGUgIldlYlBhZ2UuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJv eHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3MuaCIKKyNpbmNsdWRlIDx3dGYvdGV4 dC9BdG9taWNTdHJpbmcuaD4KKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewpAQCAtNDIsMTIgKzQ3LDI4IEBAIFBvcHVwTWVudSogV2ViU2VhcmNoUG9wdXBN ZW51Ojpwb3B1cE1lbnUKICAgICByZXR1cm4gbV9wb3B1cC5nZXQoKTsKIH0KIAotdm9pZCBXZWJT ZWFyY2hQb3B1cE1lbnU6OnNhdmVSZWNlbnRTZWFyY2hlcyhjb25zdCBBdG9taWNTdHJpbmcmLCBj b25zdCBWZWN0b3I8U3RyaW5nPiYpCit2b2lkIFdlYlNlYXJjaFBvcHVwTWVudTo6c2F2ZVJlY2Vu dFNlYXJjaGVzKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgY29uc3QgVmVjdG9yPFN0cmluZz4m IHNlYXJjaEl0ZW1zKQogeworICAgIGlmIChuYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgV2ViUGFnZSogcGFnZSA9IG1fcG9wdXAtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2Up CisgICAgICAgIHJldHVybjsKKworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24o KS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTYXZlUmVjZW50U2VhcmNoZXMobmFtZSwg c2VhcmNoSXRlbXMpLCBwYWdlLT5wYWdlSUQoKSk7CiB9CiAKLXZvaWQgV2ViU2VhcmNoUG9wdXBN ZW51Ojpsb2FkUmVjZW50U2VhcmNoZXMoY29uc3QgQXRvbWljU3RyaW5nJiwgVmVjdG9yPFN0cmlu Zz4mKQordm9pZCBXZWJTZWFyY2hQb3B1cE1lbnU6OmxvYWRSZWNlbnRTZWFyY2hlcyhjb25zdCBB dG9taWNTdHJpbmcmIG5hbWUsIFZlY3RvcjxTdHJpbmc+JiByZXN1bHRJdGVtcykKIHsKKyAgICBp ZiAobmFtZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIFdlYlBhZ2UqIHBhZ2Ug PSBtX3BvcHVwLT5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisKKyAg ICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkxvYWRSZWNlbnRTZWFyY2hlcyhuYW1lKSwgTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6TG9hZFJlY2VudFNlYXJjaGVzOjpSZXBseShyZXN1bHRJdGVtcyksIHBhZ2UtPnBhZ2VJ RCgpKTsKIH0KIAogYm9vbCBXZWJTZWFyY2hQb3B1cE1lbnU6OmVuYWJsZWQoKQo=