12733 2007-02-11 01:47:18 -0800 XPath namespace is attached to a wrong step 2007-02-17 14:21:54 -0800 1 1 1 Unclassified WebKit XML 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 12584 1 ap ap oldest_to_newest 24325 0 ap 2007-02-11 01:47:18 -0800 When parsing paths such as "//svg:g[@id = 'r_00']", the namespace gets attached to the predicate, incorrectly resulting in something like "//g[@svg:id = 'r_00']". 24326 1 13116 ap 2007-02-11 03:06:10 -0800 Created attachment 13116 proposed fix Suggestions are welcome on how to reduce code duplication in XPathGrammar.y. I thought about changing the type of NodeTest to a (string, namespace) pair, but this seemed unfair to other tests that do not use a namespace. 24101 2 13116 mjs 2007-02-11 19:18:54 -0800 Comment on attachment 13116 proposed fix You could eliminate the duplication by adding an OptionalPredicateList production. r- to consider this, although your fix seems fine as-is. 23491 3 13152 ap 2007-02-13 12:45:08 -0800 Created attachment 13152 proposed fix Thank you - did that! 23164 4 13152 darin 2007-02-15 10:03:00 -0800 Comment on attachment 13152 proposed fix The only reason I haven't marked this patch reviewed yet is that I'm not yet sure about the storage management in XPathGrammar.y -- I don't understand the rules about when a call to deleteString is needed and when it's not and I'd need to before I could mark this reviewed. 22857 5 13152 mjs 2007-02-17 08:20:22 -0800 Comment on attachment 13152 proposed fix Darin has a good point. As it is, it looks like the YYABORT calls may leak. On the other hand, it looks to me like none of this is new with Alexey's patch. It might be worth investigating separately. So r=me 22798 6 sam 2007-02-17 14:21:54 -0800 Landed in r19684. 13116 2007-02-11 03:06:10 -0800 2007-02-13 12:45:08 -0800 proposed fix 12733r1_patch.txt text/plain 11464 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE5NTY0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDctMDItMTEgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzMz CisgICAgICAgIFhQYXRoIG5hbWVzcGFjZSBpcyBhdHRhY2hlZCB0byBhIHdyb25nIHN0ZXAKKwor ICAgICAgICAqIGZhc3QveHBhdGgvbmFtZXNwYWNlLXZzLXByZWRpY2F0ZS1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGZhc3QveHBhdGgvbmFtZXNwYWNlLXZzLXByZWRpY2F0ZS54aHRt bDogQWRkZWQuCisKIDIwMDctMDItMTEgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEh5YXR0LgpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25hbWVzcGFjZS12cy1wcmVkaWNhdGUtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMt cHJlZGljYXRlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0IEBACitUZXN0 IGZvciBidWcgMTI3MzM6IFhQYXRoIG5hbWVzcGFjZSBpcyBhdHRhY2hlZCB0byBhIHdyb25nIHN0 ZXAuCisKK1NVQ0NFU1MKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC94 cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLWV4cGVjdGVkLnR4dApfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5hbWU6 IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L3BsYWluCk5hbWU6IHN2bjplb2wtc3R5bGUKICAgKyBu YXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25hbWVzcGFjZS12cy1wcmVkaWNh dGUueGh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lc3BhY2Ut dnMtcHJlZGljYXRlLnhodG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC94cGF0 aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLnhodG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM4 IEBACis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0vL1czQy8vRFREIFhIVE1MIDEuMS8vRU4iICJo dHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDExL0RURC94aHRtbDExLmR0ZCI+Cis8aHRtbCB4bWxu cz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCIgeG1sOmxhbmc9ImVuIgorICAgIHhtbG5z OnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCisgICAgeG1sbnM6eGxpbms9Imh0dHA6 Ly93d3cudzMub3JnLzE5OTkveGxpbmsiCisgICAgeG1sbnM6ZXY9Imh0dHA6Ly93d3cudzMub3Jn LzIwMDEveG1sLWV2ZW50cyIKKyAgICB4bWw6c3BhY2U9InByZXNlcnZlIj4KKzxoZWFkPgorICAg IDx0aXRsZS8+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cD5UZXN0IGZvciA8YSBocmVmPSJodHRw Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjczMyI+YnVnIDEyNzMzPC9hPjoK KyAgICBYUGF0aCBuYW1lc3BhY2UgaXMgYXR0YWNoZWQgdG8gYSB3cm9uZyBzdGVwLjwvcD4KKyAg ICA8ZGl2IGlkPSJyZXN1bHQiPkZBSUxVUkU6IHNjcmlwdCBkaWQndCBydW48L2Rpdj4KKyAgICA8 c3ZnOmcgaWQ9InJfMDAiLz4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFz VGV4dCgpOworCisgICAgICAgIGZ1bmN0aW9uIG5zUmVzb2x2ZXIocHJlZml4KSB7CisgICAgICAg ICAgICB2YXIgbnM9eworICAgICAgICAgICAgICAgICdldicgICAgIDogJ2h0dHA6Ly93d3cudzMu b3JnLzIwMDEveG1sLWV2ZW50cycsCisgICAgICAgICAgICAgICAgJ21hdGhtbCcgOiAnaHR0cDov L3d3dy53My5vcmcvMTk5OC9NYXRoL01hdGhNTCcsCisgICAgICAgICAgICAgICAgJ3N2ZycgICAg OiAnaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnLAorICAgICAgICAgICAgICAgICd4aHRtbCcg IDogJ2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwnLAorICAgICAgICAgICAgICAgICd4bGlu aycgIDogJ2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnCisgICAgICAgICAgICB9OworICAg ICAgICAgICAgcmV0dXJuIG5zW3ByZWZpeF0gfHwgbnVsbDsKKyAgICAgICAgfQorCisgICAgICAg IHZhciByZXN1bHQgPSBkb2N1bWVudC5ldmFsdWF0ZSgiLy9zdmc6Z1tAaWQgPSAncl8wMCddIiwg ZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LCBuc1Jlc29sdmVyLCBYUGF0aFJlc3VsdC5PUkRFUkVE X05PREVfU05BUFNIT1RfVFlQRSwgbnVsbCk7CisgICAgICAgIGlmIChyZXN1bHQuc25hcHNob3RM ZW5ndGggPT0gMSkKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQi KS5maXJzdENoaWxkLm5vZGVWYWx1ZSA9ICJTVUNDRVNTIjsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpLmZpcnN0Q2hpbGQubm9kZVZh bHVlID0gIkZBSUxVUkU6ICIgKyByZXN1bHQuc25hcHNob3RMZW5ndGggKyAiIG5vZGUocykgbWF0 Y2hlZCAtIHNob3VsZCBiZSAxIjsKKyAgICA8L3NjcmlwdD4KKworPC9ib2R5PgorPC9odG1sPgoK UHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMt cHJlZGljYXRlLnhodG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3ZuOm1pbWUtdHlwZQogICArIHRleHQv eG1sCgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFu Z2VMb2cJKHJldmlzaW9uIDE5NTY0KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwyNCBAQAorMjAwNy0wMi0xMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFw QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MzMKKyAgICAg ICAgWFBhdGggbmFtZXNwYWNlIGlzIGF0dGFjaGVkIHRvIGEgd3Jvbmcgc3RlcAorCisgICAgICAg ICogeG1sL1hQYXRoR3JhbW1hci55OiBOQU1FVEVTVCBpcyBkaWZmZXJlbnQgZnJvbSBvdGhlciBO b2RlVGVzdHMgaW4gdGhhdCBpdHMKKyAgICAgICAgcmVzdWx0aW5nIHR5cGUgaXMgYW4gZXhwYW5k ZWQgbmFtZSwgcmF0aGVyIHRoYW4gYSBzdHJpbmcuIEl0IGlzIG5vdCByZWFsbHkgcG9zc2libGUg CisgICAgICAgIHRvIHN0b3JlIHRoZSBuYW1lc3BhY2UgaW5zaWRlIFBhcnNlciwgYmVjYXVzZSBp dCBnZXRzIHVzZWQgaW4gd3Jvbmcgc3RlcHMgdGhlbi4KKworICAgICAgICAqIHhtbC9YUGF0aFBh cnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYUGF0aDo6UGFyc2VyOjpleHBhbmRRTmFtZSk6 CisgICAgICAgICogeG1sL1hQYXRoUGFyc2VyLmg6CisgICAgICAgIE1vdmVkIGNvZGUgdGhhdCBl eHBhbmRzIGEgUU5hbWUgZnJvbSBYUGF0aEdyYW1tYXIueS4gUmVtb3ZlZCBtX2N1cnJlbnROYW1l c3BhY2VVUkkuCisKKyAgICAgICAgKiB4bWwvWFBhdGhTdGVwLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlhQYXRoOjpTdGVwOjpTdGVwKToKKyAgICAgICAgKiB4bWwvWFBhdGhTdGVwLmg6CisgICAg ICAgIEFkZGVkIGEgY29uc3RydWN0b3IgdGhhdCB0YWtlcyBhIG5hbWVzcGFjZS4KKwogMjAwNy0w Mi0xMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgSHlhdHQuCkluZGV4OiBXZWJDb3JlL3htbC9YUGF0aEdyYW1tYXIueQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3htbC9YUGF0aEdyYW1tYXIueQkocmV2aXNpb24gMTk1NjIpCisrKyBX ZWJDb3JlL3htbC9YUGF0aEdyYW1tYXIueQkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDcgQEAK IC8qCiAgKiBDb3B5cmlnaHQgMjAwNSBGcmVyaWNoIFJhYWJlIDxyYWFiZUBrZGUub3JnPgogICog Q29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMuCisgKiBDb3B5cmlnaHQgKEMp IDIwMDcgQWxleGV5IFByb3NrdXJ5YWtvdiA8YXBAd2Via2l0Lm9yZz4KICAqCiAgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtMTgxLDYgKzE4MiwyMCBAQCBTdGVwOgogICAgICAgICBQQVJT RVItPnJlZ2lzdGVyUGFyc2VOb2RlKCQkKTsKICAgICB9CiAgICAgfAorICAgIE5BTUVURVNUCisg ICAgeworICAgICAgICBTdHJpbmcgbG9jYWxOYW1lOworICAgICAgICBTdHJpbmcgbmFtZXNwYWNl VVJJOworICAgICAgICBpZiAoIVBBUlNFUi0+ZXhwYW5kUU5hbWUoKiQxLCBsb2NhbE5hbWUsIG5h bWVzcGFjZVVSSSkpIHsKKyAgICAgICAgICAgIFBBUlNFUi0+bV9nb3ROYW1lc3BhY2VFcnJvciA9 IHRydWU7CisgICAgICAgICAgICBZWUFCT1JUOworICAgICAgICB9CisgICAgICAgIAorICAgICAg ICAkJCA9IG5ldyBTdGVwKFN0ZXA6OkNoaWxkQXhpcywgbG9jYWxOYW1lLCBuYW1lc3BhY2VVUkkp OworICAgICAgICBQQVJTRVItPmRlbGV0ZVN0cmluZygkMSk7CisgICAgICAgIFBBUlNFUi0+cmVn aXN0ZXJQYXJzZU5vZGUoJCQpOworICAgIH0KKyAgICB8CiAgICAgTm9kZVRlc3QgUHJlZGljYXRl TGlzdAogICAgIHsKICAgICAgICAgJCQgPSBuZXcgU3RlcChTdGVwOjpDaGlsZEF4aXMsICokMSwg KiQyKTsKQEAgLTE4OSw2ICsyMDQsMjEgQEAgU3RlcDoKICAgICAgICAgUEFSU0VSLT5yZWdpc3Rl clBhcnNlTm9kZSgkJCk7CiAgICAgfQogICAgIHwKKyAgICBOQU1FVEVTVCBQcmVkaWNhdGVMaXN0 CisgICAgeworICAgICAgICBTdHJpbmcgbG9jYWxOYW1lOworICAgICAgICBTdHJpbmcgbmFtZXNw YWNlVVJJOworICAgICAgICBpZiAoIVBBUlNFUi0+ZXhwYW5kUU5hbWUoKiQxLCBsb2NhbE5hbWUs IG5hbWVzcGFjZVVSSSkpIHsKKyAgICAgICAgICAgIFBBUlNFUi0+bV9nb3ROYW1lc3BhY2VFcnJv ciA9IHRydWU7CisgICAgICAgICAgICBZWUFCT1JUOworICAgICAgICB9CisKKyAgICAgICAgJCQg PSBuZXcgU3RlcChTdGVwOjpDaGlsZEF4aXMsIGxvY2FsTmFtZSwgbmFtZXNwYWNlVVJJLCAqJDIp OworICAgICAgICBQQVJTRVItPmRlbGV0ZVN0cmluZygkMSk7CisgICAgICAgIFBBUlNFUi0+ZGVs ZXRlUHJlZGljYXRlVmVjdG9yKCQyKTsKKyAgICAgICAgUEFSU0VSLT5yZWdpc3RlclBhcnNlTm9k ZSgkJCk7CisgICAgfQorICAgIHwKICAgICBBeGlzU3BlY2lmaWVyIE5vZGVUZXN0CiAgICAgewog ICAgICAgICAkJCA9IG5ldyBTdGVwKCQxLCAqJDIpOwpAQCAtMTk2LDYgKzIyNiwyMCBAQCBTdGVw OgogICAgICAgICBQQVJTRVItPnJlZ2lzdGVyUGFyc2VOb2RlKCQkKTsKICAgICB9CiAgICAgfAor ICAgIEF4aXNTcGVjaWZpZXIgTkFNRVRFU1QKKyAgICB7CisgICAgICAgIFN0cmluZyBsb2NhbE5h bWU7CisgICAgICAgIFN0cmluZyBuYW1lc3BhY2VVUkk7CisgICAgICAgIGlmICghUEFSU0VSLT5l eHBhbmRRTmFtZSgqJDIsIGxvY2FsTmFtZSwgbmFtZXNwYWNlVVJJKSkgeworICAgICAgICAgICAg UEFSU0VSLT5tX2dvdE5hbWVzcGFjZUVycm9yID0gdHJ1ZTsKKyAgICAgICAgICAgIFlZQUJPUlQ7 CisgICAgICAgIH0KKworICAgICAgICAkJCA9IG5ldyBTdGVwKCQxLCBsb2NhbE5hbWUsIG5hbWVz cGFjZVVSSSk7CisgICAgICAgIFBBUlNFUi0+ZGVsZXRlU3RyaW5nKCQyKTsKKyAgICAgICAgUEFS U0VSLT5yZWdpc3RlclBhcnNlTm9kZSgkJCk7CisgICAgfQorICAgIHwKICAgICBBeGlzU3BlY2lm aWVyIE5vZGVUZXN0IFByZWRpY2F0ZUxpc3QKICAgICB7CiAgICAgICAgICQkID0gbmV3IFN0ZXAo JDEsICokMiwgKiQzKTsKQEAgLTIwNCw2ICsyNDgsMjEgQEAgU3RlcDoKICAgICAgICAgUEFSU0VS LT5yZWdpc3RlclBhcnNlTm9kZSgkJCk7CiAgICAgfQogICAgIHwKKyAgICBBeGlzU3BlY2lmaWVy IE5BTUVURVNUIFByZWRpY2F0ZUxpc3QKKyAgICB7CisgICAgICAgIFN0cmluZyBsb2NhbE5hbWU7 CisgICAgICAgIFN0cmluZyBuYW1lc3BhY2VVUkk7CisgICAgICAgIGlmICghUEFSU0VSLT5leHBh bmRRTmFtZSgqJDIsIGxvY2FsTmFtZSwgbmFtZXNwYWNlVVJJKSkgeworICAgICAgICAgICAgUEFS U0VSLT5tX2dvdE5hbWVzcGFjZUVycm9yID0gdHJ1ZTsKKyAgICAgICAgICAgIFlZQUJPUlQ7Cisg ICAgICAgIH0KKworICAgICAgICAkJCA9IG5ldyBTdGVwKCQxLCBsb2NhbE5hbWUsIG5hbWVzcGFj ZVVSSSwgKiQzKTsKKyAgICAgICAgUEFSU0VSLT5kZWxldGVTdHJpbmcoJDIpOworICAgICAgICBQ QVJTRVItPmRlbGV0ZVByZWRpY2F0ZVZlY3RvcigkMyk7CisgICAgICAgIFBBUlNFUi0+cmVnaXN0 ZXJQYXJzZU5vZGUoJCQpOworICAgIH0KKyAgICB8CiAgICAgQWJicmV2aWF0ZWRTdGVwCiAgICAg OwogCkBAIC0yMTcsMjYgKzI3Niw2IEBAIEF4aXNTcGVjaWZpZXI6CiAgICAgOwogCiBOb2RlVGVz dDoKLSAgICBOQU1FVEVTVAotICAgIHsKLSAgICAgICAgaW50IGNvbG9uID0gJCQtPmZpbmQoJzon KTsKLSAgICAgICAgaWYgKGNvbG9uID49IDApIHsKLSAgICAgICAgICAgIFhQYXRoTlNSZXNvbHZl ciogcmVzb2x2ZXIgPSBQQVJTRVItPnJlc29sdmVyKCk7Ci0gICAgICAgICAgICBpZiAoIXJlc29s dmVyKSB7Ci0gICAgICAgICAgICAgICAgUEFSU0VSLT5tX2dvdE5hbWVzcGFjZUVycm9yID0gdHJ1 ZTsKLSAgICAgICAgICAgICAgICBZWUFCT1JUOwotICAgICAgICAgICAgfQotICAgICAgICAgICAg UEFSU0VSLT5tX2N1cnJlbnROYW1lc3BhY2VVUkkgPSByZXNvbHZlci0+bG9va3VwTmFtZXNwYWNl VVJJKCQkLT5sZWZ0KGNvbG9uKSk7Ci0gICAgICAgICAgICBpZiAoUEFSU0VSLT5tX2N1cnJlbnRO YW1lc3BhY2VVUkkuaXNOdWxsKCkpIHsKLSAgICAgICAgICAgICAgICBQQVJTRVItPm1fZ290TmFt ZXNwYWNlRXJyb3IgPSB0cnVlOwotICAgICAgICAgICAgICAgIFlZQUJPUlQ7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICAkJCA9IG5ldyBTdHJpbmcoJDEtPnN1YnN0cmluZyhjb2xvbiArIDEp KTsKLSAgICAgICAgICAgIFBBUlNFUi0+ZGVsZXRlU3RyaW5nKCQxKTsKLSAgICAgICAgICAgIFBB UlNFUi0+cmVnaXN0ZXJTdHJpbmcoJCQpOwotICAgICAgICB9Ci0gICAgfQotICAgIHwKICAgICBO T0RFVFlQRSAnKCcgJyknCiAgICAgewogICAgICAgICAkJCA9IG5ldyBTdHJpbmcoKiQxICsgIigp Iik7CkluZGV4OiBXZWJDb3JlL3htbC9YUGF0aFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS94bWwvWFBhdGhQYXJzZXIuY3BwCShyZXZpc2lvbiAxOTU2MikKKysrIFdlYkNvcmUveG1s L1hQYXRoUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQ2LDYgKzQ0NiwyMiBAQCBpbnQg UGFyc2VyOjpsZXgodm9pZCogZGF0YSkKICAgICByZXR1cm4gdG9rLnR5cGU7CiB9CiAKK2Jvb2wg UGFyc2VyOjpleHBhbmRRTmFtZShjb25zdCBTdHJpbmcmIHFOYW1lLCBTdHJpbmcmIGxvY2FsTmFt ZSwgU3RyaW5nJiBuYW1lc3BhY2VVUkkpCit7CisgICAgaW50IGNvbG9uID0gcU5hbWUuZmluZCgn OicpOworICAgIGlmIChjb2xvbiA+PSAwKSB7CisgICAgICAgIGlmICghbV9yZXNvbHZlcikKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgbmFtZXNwYWNlVVJJID0gbV9yZXNvbHZl ci0+bG9va3VwTmFtZXNwYWNlVVJJKHFOYW1lLmxlZnQoY29sb24pKTsKKyAgICAgICAgaWYgKG5h bWVzcGFjZVVSSS5pc051bGwoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg bG9jYWxOYW1lID0gcU5hbWUuc3Vic3RyaW5nKGNvbG9uICsgMSk7CisgICAgfSBlbHNlCisgICAg ICAgIGxvY2FsTmFtZSA9IHFOYW1lOworICAgIAorICAgIHJldHVybiB0cnVlOworfQorCiBFeHBy ZXNzaW9uKiBQYXJzZXI6OnBhcnNlU3RhdGVtZW50KGNvbnN0IFN0cmluZyYgc3RhdGVtZW50LCBQ YXNzUmVmUHRyPFhQYXRoTlNSZXNvbHZlcj4gcmVzb2x2ZXIsIEV4Y2VwdGlvbkNvZGUmIGVjKQog ewogICAgIHJlc2V0KHN0YXRlbWVudCk7CkluZGV4OiBXZWJDb3JlL3htbC9YUGF0aFBhcnNlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUveG1sL1hQYXRoUGFyc2VyLmgJKHJldmlzaW9uIDE5NTYy KQorKysgV2ViQ29yZS94bWwvWFBhdGhQYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiAr NjMsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICBQYXJzZXIoKTsKIAogICAg ICAgICAgICAgWFBhdGhOU1Jlc29sdmVyKiByZXNvbHZlcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVz b2x2ZXIuZ2V0KCk7IH0KKyAgICAgICAgICAgIGJvb2wgZXhwYW5kUU5hbWUoY29uc3QgU3RyaW5n JiBxTmFtZSwgU3RyaW5nJiBsb2NhbE5hbWUsIFN0cmluZyYgbmFtZXNwYWNlVVJJKTsKKwogICAg ICAgICAgICAgRXhwcmVzc2lvbiogcGFyc2VTdGF0ZW1lbnQoY29uc3QgU3RyaW5nJiBzdGF0ZW1l bnQsIFBhc3NSZWZQdHI8WFBhdGhOU1Jlc29sdmVyPiwgRXhjZXB0aW9uQ29kZSYpOwogCiAgICAg ICAgICAgICBzdGF0aWMgUGFyc2VyKiBjdXJyZW50KCkgeyByZXR1cm4gY3VycmVudFBhcnNlcjsg fQpAQCAtNzEsNyArNzMsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgICAgIEV4 cHJlc3Npb24qIG1fdG9wRXhwcjsKICAgICAgICAgICAgIGJvb2wgbV9nb3ROYW1lc3BhY2VFcnJv cjsKLSAgICAgICAgICAgIFN0cmluZyBtX2N1cnJlbnROYW1lc3BhY2VVUkk7CiAKICAgICAgICAg ICAgIHZvaWQgcmVnaXN0ZXJQYXJzZU5vZGUoUGFyc2VOb2RlKik7CiAgICAgICAgICAgICB2b2lk IHVucmVnaXN0ZXJQYXJzZU5vZGUoUGFyc2VOb2RlKik7CkluZGV4OiBXZWJDb3JlL3htbC9YUGF0 aFN0ZXAuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUveG1sL1hQYXRoU3RlcC5jcHAJKHJldmlz aW9uIDE5NTY0KQorKysgV2ViQ29yZS94bWwvWFBhdGhTdGVwLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgMjAwNSBGcmVyaWNoIFJhYWJlIDxyYWFi ZUBrZGUub3JnPgogICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMuCisg KiBDb3B5cmlnaHQgKEMpIDIwMDcgQWxleGV5IFByb3NrdXJ5YWtvdiA8YXBAd2Via2l0Lm9yZz4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzgsMTIgKzM5LDE4IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBYUGF0aCB7CiAKIFN0ZXA6OlN0ZXAoQXhpcyBheGlz LCBjb25zdCBTdHJpbmcmIG5vZGVUZXN0LCBjb25zdCBWZWN0b3I8UHJlZGljYXRlKj4mIHByZWRp Y2F0ZXMpCi0gICAgOiBtX2F4aXMoYXhpcyksIG1fbm9kZVRlc3Qobm9kZVRlc3QpLCBtX3ByZWRp Y2F0ZXMocHJlZGljYXRlcykKKyAgICA6IG1fYXhpcyhheGlzKQorICAgICwgbV9ub2RlVGVzdChu b2RlVGVzdCkKKyAgICAsIG1fcHJlZGljYXRlcyhwcmVkaWNhdGVzKQoreworfQorCitTdGVwOjpT dGVwKEF4aXMgYXhpcywgY29uc3QgU3RyaW5nJiBub2RlVGVzdCwgY29uc3QgU3RyaW5nJiBuYW1l c3BhY2VVUkksIGNvbnN0IFZlY3RvcjxQcmVkaWNhdGUqPiYgcHJlZGljYXRlcykKKyAgICA6IG1f YXhpcyhheGlzKQorICAgICwgbV9ub2RlVGVzdChub2RlVGVzdCkKKyAgICAsIG1fbmFtZXNwYWNl VVJJKG5hbWVzcGFjZVVSSSkKKyAgICAsIG1fcHJlZGljYXRlcyhwcmVkaWNhdGVzKQogewotICAg IFBhcnNlciogcGFyc2VyID0gUGFyc2VyOjpjdXJyZW50KCk7Ci0gICAgQVNTRVJUKHBhcnNlcik7 Ci0gICAgbV9uYW1lc3BhY2VVUkkgPSBwYXJzZXItPm1fY3VycmVudE5hbWVzcGFjZVVSSTsKLSAg ICBwYXJzZXItPm1fY3VycmVudE5hbWVzcGFjZVVSSSA9IFN0cmluZygpOwogfQogCiBTdGVwOjp+ U3RlcCgpCkluZGV4OiBXZWJDb3JlL3htbC9YUGF0aFN0ZXAuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3htbC9YUGF0aFN0ZXAuaAkocmV2aXNpb24gMTk1NjIpCisrKyBXZWJDb3JlL3htbC9YUGF0 aFN0ZXAuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNiArNTAsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgICAgICB9OwogCiAgICAgICAgICAgICBTdGVwKEF4aXMsIGNvbnN0IFN0cmlu ZyYgbm9kZVRlc3QsIGNvbnN0IFZlY3RvcjxQcmVkaWNhdGUqPiYgcHJlZGljYXRlcyA9IFZlY3Rv cjxQcmVkaWNhdGUqPigpKTsKKyAgICAgICAgICAgIFN0ZXAoQXhpcywgY29uc3QgU3RyaW5nJiBu b2RlVGVzdCwgY29uc3QgU3RyaW5nJiBuYW1lc3BhY2VVUkksIGNvbnN0IFZlY3RvcjxQcmVkaWNh dGUqPiYgcHJlZGljYXRlcyA9IFZlY3RvcjxQcmVkaWNhdGUqPigpKTsKICAgICAgICAgICAgIH5T dGVwKCk7CiAKICAgICAgICAgICAgIE5vZGVWZWN0b3IgZXZhbHVhdGUoTm9kZSogY29udGV4dCkg Y29uc3Q7Cg== 13152 2007-02-13 12:45:08 -0800 2007-02-17 08:20:22 -0800 proposed fix 12733r2_patch.txt text/plain 11853 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE5NjA3KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDctMDItMTMgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzMz CisgICAgICAgIFhQYXRoIG5hbWVzcGFjZSBpcyBhdHRhY2hlZCB0byBhIHdyb25nIHN0ZXAKKwor ICAgICAgICAqIGZhc3QveHBhdGgvbmFtZXNwYWNlLXZzLXByZWRpY2F0ZS1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGZhc3QveHBhdGgvbmFtZXNwYWNlLXZzLXByZWRpY2F0ZS54aHRt bDogQWRkZWQuCisKIDIwMDctMDItMTMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRoZSBTcGlyaXQgb2YgTGF5b3V0IFRlc3QgRml4aW5n IQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLWV4 cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25hbWVzcGFj ZS12cy1wcmVkaWNhdGUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv ZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSw0IEBACitUZXN0IGZvciBidWcgMTI3MzM6IFhQYXRoIG5hbWVzcGFjZSBp cyBhdHRhY2hlZCB0byBhIHdyb25nIHN0ZXAuCisKK1NVQ0NFU1MKKwoKUHJvcGVydHkgY2hhbmdl cyBvbjogTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLWV4cGVj dGVkLnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCk5hbWU6IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L3BsYWluCk5h bWU6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3hw YXRoL25hbWVzcGFjZS12cy1wcmVkaWNhdGUueGh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLnhodG1sCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLnhodG1sCShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM4IEBACis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0vL1cz Qy8vRFREIFhIVE1MIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDExL0RURC94 aHRtbDExLmR0ZCI+Cis8aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCIg eG1sOmxhbmc9ImVuIgorICAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmci CisgICAgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiCisgICAgeG1s bnM6ZXY9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cyIKKyAgICB4bWw6c3BhY2U9 InByZXNlcnZlIj4KKzxoZWFkPgorICAgIDx0aXRsZS8+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8 cD5UZXN0IGZvciA8YSBocmVmPSJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjczMyI+YnVnIDEyNzMzPC9hPjoKKyAgICBYUGF0aCBuYW1lc3BhY2UgaXMgYXR0YWNoZWQg dG8gYSB3cm9uZyBzdGVwLjwvcD4KKyAgICA8ZGl2IGlkPSJyZXN1bHQiPkZBSUxVUkU6IHNjcmlw dCBkaWQndCBydW48L2Rpdj4KKyAgICA8c3ZnOmcgaWQ9InJfMDAiLz4KKyAgICA8c2NyaXB0Pgor ICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgICAgbGF5 b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgIGZ1bmN0aW9uIG5zUmVz b2x2ZXIocHJlZml4KSB7CisgICAgICAgICAgICB2YXIgbnM9eworICAgICAgICAgICAgICAgICdl dicgICAgIDogJ2h0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cycsCisgICAgICAgICAg ICAgICAgJ21hdGhtbCcgOiAnaHR0cDovL3d3dy53My5vcmcvMTk5OC9NYXRoL01hdGhNTCcsCisg ICAgICAgICAgICAgICAgJ3N2ZycgICAgOiAnaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnLAor ICAgICAgICAgICAgICAgICd4aHRtbCcgIDogJ2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwn LAorICAgICAgICAgICAgICAgICd4bGluaycgIDogJ2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxp bmsnCisgICAgICAgICAgICB9OworICAgICAgICAgICAgcmV0dXJuIG5zW3ByZWZpeF0gfHwgbnVs bDsKKyAgICAgICAgfQorCisgICAgICAgIHZhciByZXN1bHQgPSBkb2N1bWVudC5ldmFsdWF0ZSgi Ly9zdmc6Z1tAaWQgPSAncl8wMCddIiwgZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LCBuc1Jlc29s dmVyLCBYUGF0aFJlc3VsdC5PUkRFUkVEX05PREVfU05BUFNIT1RfVFlQRSwgbnVsbCk7CisgICAg ICAgIGlmIChyZXN1bHQuc25hcHNob3RMZW5ndGggPT0gMSkKKyAgICAgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQiKS5maXJzdENoaWxkLm5vZGVWYWx1ZSA9ICJTVUNDRVNT IjsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJl c3VsdCIpLmZpcnN0Q2hpbGQubm9kZVZhbHVlID0gIkZBSUxVUkU6ICIgKyByZXN1bHQuc25hcHNo b3RMZW5ndGggKyAiIG5vZGUocykgbWF0Y2hlZCAtIHNob3VsZCBiZSAxIjsKKyAgICA8L3Njcmlw dD4KKworPC9ib2R5PgorPC9odG1sPgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMv ZmFzdC94cGF0aC9uYW1lc3BhY2UtdnMtcHJlZGljYXRlLnhodG1sCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTog c3ZuOm1pbWUtdHlwZQogICArIHRleHQveG1sCgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjA3KQorKysgV2ViQ29y ZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAwNy0wMi0xMyAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzMKKyAgICAgICAgWFBhdGggbmFtZXNwYWNlIGlzIGF0dGFjaGVkIHRv IGEgd3Jvbmcgc3RlcAorCisgICAgICAgICogeG1sL1hQYXRoR3JhbW1hci55OiBOQU1FVEVTVCBp cyBkaWZmZXJlbnQgZnJvbSBvdGhlciBOb2RlVGVzdHMgaW4gdGhhdCBpdHMKKyAgICAgICAgcmVz dWx0aW5nIHR5cGUgaXMgYW4gZXhwYW5kZWQgbmFtZSwgcmF0aGVyIHRoYW4gYSBzdHJpbmcuIEl0 IGlzIG5vdCByZWFsbHkgcG9zc2libGUgCisgICAgICAgIHRvIHN0b3JlIHRoZSBuYW1lc3BhY2Ug aW5zaWRlIFBhcnNlciwgYmVjYXVzZSBpdCBnZXRzIHVzZWQgaW4gd3Jvbmcgc3RlcHMgdGhlbi4K KworICAgICAgICAqIHhtbC9YUGF0aFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYUGF0 aDo6UGFyc2VyOjpleHBhbmRRTmFtZSk6CisgICAgICAgICogeG1sL1hQYXRoUGFyc2VyLmg6Cisg ICAgICAgIE1vdmVkIGNvZGUgdGhhdCBleHBhbmRzIGEgUU5hbWUgZnJvbSBYUGF0aEdyYW1tYXIu eS4gUmVtb3ZlZCBtX2N1cnJlbnROYW1lc3BhY2VVUkkuCisKKyAgICAgICAgKiB4bWwvWFBhdGhT dGVwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhQYXRoOjpTdGVwOjpTdGVwKToKKyAgICAgICAg KiB4bWwvWFBhdGhTdGVwLmg6CisgICAgICAgIEFkZGVkIGEgY29uc3RydWN0b3IgdGhhdCB0YWtl cyBhIG5hbWVzcGFjZS4KKwogMjAwNy0wMi0xMyAgRGV4IERlYWNvbiAgPG9jY3VwYW50NEBnbWFp bC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBXZWJDb3JlL3htbC9Y UGF0aEdyYW1tYXIueQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3htbC9YUGF0aEdyYW1tYXIueQko cmV2aXNpb24gMTk2MDcpCisrKyBXZWJDb3JlL3htbC9YUGF0aEdyYW1tYXIueQkod29ya2luZyBj b3B5KQpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgMjAwNSBGcmVyaWNoIFJhYWJl IDxyYWFiZUBrZGUub3JnPgogICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJ bmMuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQWxleGV5IFByb3NrdXJ5YWtvdiA8YXBAd2Via2l0 Lm9yZz4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtOTAsNiArOTEsNyBAQCB2 b2lkIHhwYXRoeXllcnJvcihjb25zdCBjaGFyICpzdHIpIHsgfQogJXR5cGUgPHN0ZXA+IERlc2Nl bmRhbnRPclNlbGYKICV0eXBlIDxzdHI+IE5vZGVUZXN0CiAldHlwZSA8ZXhwcj4gUHJlZGljYXRl CisldHlwZSA8cHJlZExpc3Q+IE9wdGlvbmFsUHJlZGljYXRlTGlzdAogJXR5cGUgPHByZWRMaXN0 PiBQcmVkaWNhdGVMaXN0CiAldHlwZSA8c3RlcD4gQWJicmV2aWF0ZWRTdGVwCiAldHlwZSA8ZXhw cj4gRXhwcgpAQCAtMTc0LDMzICsxNzYsNjEgQEAgUmVsYXRpdmVMb2NhdGlvblBhdGg6CiAgICAg OwogCiBTdGVwOgotICAgIE5vZGVUZXN0CisgICAgTm9kZVRlc3QgT3B0aW9uYWxQcmVkaWNhdGVM aXN0CiAgICAgewotICAgICAgICAkJCA9IG5ldyBTdGVwKFN0ZXA6OkNoaWxkQXhpcywgKiQxKTsK KyAgICAgICAgaWYgKCQyKSB7CisgICAgICAgICAgICAkJCA9IG5ldyBTdGVwKFN0ZXA6OkNoaWxk QXhpcywgKiQxLCAqJDIpOworICAgICAgICAgICAgUEFSU0VSLT5kZWxldGVQcmVkaWNhdGVWZWN0 b3IoJDIpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICQkID0gbmV3IFN0ZXAoU3RlcDo6 Q2hpbGRBeGlzLCAqJDEpOwogICAgICAgICBQQVJTRVItPmRlbGV0ZVN0cmluZygkMSk7CiAgICAg ICAgIFBBUlNFUi0+cmVnaXN0ZXJQYXJzZU5vZGUoJCQpOwogICAgIH0KICAgICB8Ci0gICAgTm9k ZVRlc3QgUHJlZGljYXRlTGlzdAorICAgIE5BTUVURVNUIE9wdGlvbmFsUHJlZGljYXRlTGlzdAog ICAgIHsKLSAgICAgICAgJCQgPSBuZXcgU3RlcChTdGVwOjpDaGlsZEF4aXMsICokMSwgKiQyKTsK KyAgICAgICAgU3RyaW5nIGxvY2FsTmFtZTsKKyAgICAgICAgU3RyaW5nIG5hbWVzcGFjZVVSSTsK KyAgICAgICAgaWYgKCFQQVJTRVItPmV4cGFuZFFOYW1lKCokMSwgbG9jYWxOYW1lLCBuYW1lc3Bh Y2VVUkkpKSB7CisgICAgICAgICAgICBQQVJTRVItPm1fZ290TmFtZXNwYWNlRXJyb3IgPSB0cnVl OworICAgICAgICAgICAgWVlBQk9SVDsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgaWYg KCQyKSB7CisgICAgICAgICAgICAkJCA9IG5ldyBTdGVwKFN0ZXA6OkNoaWxkQXhpcywgbG9jYWxO YW1lLCBuYW1lc3BhY2VVUkksICokMik7CisgICAgICAgICAgICBQQVJTRVItPmRlbGV0ZVByZWRp Y2F0ZVZlY3RvcigkMik7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgJCQgPSBuZXcgU3Rl cChTdGVwOjpDaGlsZEF4aXMsIGxvY2FsTmFtZSwgbmFtZXNwYWNlVVJJKTsKICAgICAgICAgUEFS U0VSLT5kZWxldGVTdHJpbmcoJDEpOwotICAgICAgICBQQVJTRVItPmRlbGV0ZVByZWRpY2F0ZVZl Y3RvcigkMik7CiAgICAgICAgIFBBUlNFUi0+cmVnaXN0ZXJQYXJzZU5vZGUoJCQpOwogICAgIH0K ICAgICB8Ci0gICAgQXhpc1NwZWNpZmllciBOb2RlVGVzdAorICAgIEF4aXNTcGVjaWZpZXIgTm9k ZVRlc3QgT3B0aW9uYWxQcmVkaWNhdGVMaXN0CiAgICAgewotICAgICAgICAkJCA9IG5ldyBTdGVw KCQxLCAqJDIpOworICAgICAgICBpZiAoJDMpIHsKKyAgICAgICAgICAgICQkID0gbmV3IFN0ZXAo JDEsICokMiwgKiQzKTsKKyAgICAgICAgICAgIFBBUlNFUi0+ZGVsZXRlUHJlZGljYXRlVmVjdG9y KCQzKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAkJCA9IG5ldyBTdGVwKCQxLCAqJDIp OwogICAgICAgICBQQVJTRVItPmRlbGV0ZVN0cmluZygkMik7CiAgICAgICAgIFBBUlNFUi0+cmVn aXN0ZXJQYXJzZU5vZGUoJCQpOwogICAgIH0KICAgICB8Ci0gICAgQXhpc1NwZWNpZmllciBOb2Rl VGVzdCBQcmVkaWNhdGVMaXN0CisgICAgQXhpc1NwZWNpZmllciBOQU1FVEVTVCBPcHRpb25hbFBy ZWRpY2F0ZUxpc3QKICAgICB7Ci0gICAgICAgICQkID0gbmV3IFN0ZXAoJDEsICokMiwgKiQzKTsK KyAgICAgICAgU3RyaW5nIGxvY2FsTmFtZTsKKyAgICAgICAgU3RyaW5nIG5hbWVzcGFjZVVSSTsK KyAgICAgICAgaWYgKCFQQVJTRVItPmV4cGFuZFFOYW1lKCokMiwgbG9jYWxOYW1lLCBuYW1lc3Bh Y2VVUkkpKSB7CisgICAgICAgICAgICBQQVJTRVItPm1fZ290TmFtZXNwYWNlRXJyb3IgPSB0cnVl OworICAgICAgICAgICAgWVlBQk9SVDsKKyAgICAgICAgfQorCisgICAgICAgIGlmICgkMykgewor ICAgICAgICAgICAgJCQgPSBuZXcgU3RlcCgkMSwgbG9jYWxOYW1lLCBuYW1lc3BhY2VVUkksICok Myk7CisgICAgICAgICAgICBQQVJTRVItPmRlbGV0ZVByZWRpY2F0ZVZlY3RvcigkMyk7CisgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgJCQgPSBuZXcgU3RlcCgkMSwgbG9jYWxOYW1lLCBuYW1l c3BhY2VVUkkpOwogICAgICAgICBQQVJTRVItPmRlbGV0ZVN0cmluZygkMik7Ci0gICAgICAgIFBB UlNFUi0+ZGVsZXRlUHJlZGljYXRlVmVjdG9yKCQzKTsKICAgICAgICAgUEFSU0VSLT5yZWdpc3Rl clBhcnNlTm9kZSgkJCk7CiAgICAgfQogICAgIHwKQEAgLTIxNywyNiArMjQ3LDYgQEAgQXhpc1Nw ZWNpZmllcjoKICAgICA7CiAKIE5vZGVUZXN0OgotICAgIE5BTUVURVNUCi0gICAgewotICAgICAg ICBpbnQgY29sb24gPSAkJC0+ZmluZCgnOicpOwotICAgICAgICBpZiAoY29sb24gPj0gMCkgewot ICAgICAgICAgICAgWFBhdGhOU1Jlc29sdmVyKiByZXNvbHZlciA9IFBBUlNFUi0+cmVzb2x2ZXIo KTsKLSAgICAgICAgICAgIGlmICghcmVzb2x2ZXIpIHsKLSAgICAgICAgICAgICAgICBQQVJTRVIt Pm1fZ290TmFtZXNwYWNlRXJyb3IgPSB0cnVlOwotICAgICAgICAgICAgICAgIFlZQUJPUlQ7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICBQQVJTRVItPm1fY3VycmVudE5hbWVzcGFjZVVSSSA9 IHJlc29sdmVyLT5sb29rdXBOYW1lc3BhY2VVUkkoJCQtPmxlZnQoY29sb24pKTsKLSAgICAgICAg ICAgIGlmIChQQVJTRVItPm1fY3VycmVudE5hbWVzcGFjZVVSSS5pc051bGwoKSkgewotICAgICAg ICAgICAgICAgIFBBUlNFUi0+bV9nb3ROYW1lc3BhY2VFcnJvciA9IHRydWU7Ci0gICAgICAgICAg ICAgICAgWVlBQk9SVDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgICQkID0gbmV3IFN0cmlu ZygkMS0+c3Vic3RyaW5nKGNvbG9uICsgMSkpOwotICAgICAgICAgICAgUEFSU0VSLT5kZWxldGVT dHJpbmcoJDEpOwotICAgICAgICAgICAgUEFSU0VSLT5yZWdpc3RlclN0cmluZygkJCk7Ci0gICAg ICAgIH0KLSAgICB9Ci0gICAgfAogICAgIE5PREVUWVBFICcoJyAnKScKICAgICB7CiAgICAgICAg ICQkID0gbmV3IFN0cmluZygqJDEgKyAiKCkiKTsKQEAgLTI1Niw2ICsyNjYsMTUgQEAgTm9kZVRl c3Q6CiAgICAgfQogICAgIDsKIAorT3B0aW9uYWxQcmVkaWNhdGVMaXN0OgorICAgIC8qIGVtcHR5 ICovCisgICAgeworICAgICAgICAkJCA9IDA7CisgICAgfQorICAgIHwKKyAgICBQcmVkaWNhdGVM aXN0CisgICAgOworCiBQcmVkaWNhdGVMaXN0OgogICAgIFByZWRpY2F0ZQogICAgIHsKSW5kZXg6 IFdlYkNvcmUveG1sL1hQYXRoUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3htbC9Y UGF0aFBhcnNlci5jcHAJKHJldmlzaW9uIDE5NjA3KQorKysgV2ViQ29yZS94bWwvWFBhdGhQYXJz ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NDYsNiArNDQ2LDIyIEBAIGludCBQYXJzZXI6Omxl eCh2b2lkKiBkYXRhKQogICAgIHJldHVybiB0b2sudHlwZTsKIH0KIAorYm9vbCBQYXJzZXI6OmV4 cGFuZFFOYW1lKGNvbnN0IFN0cmluZyYgcU5hbWUsIFN0cmluZyYgbG9jYWxOYW1lLCBTdHJpbmcm IG5hbWVzcGFjZVVSSSkKK3sKKyAgICBpbnQgY29sb24gPSBxTmFtZS5maW5kKCc6Jyk7CisgICAg aWYgKGNvbG9uID49IDApIHsKKyAgICAgICAgaWYgKCFtX3Jlc29sdmVyKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICBuYW1lc3BhY2VVUkkgPSBtX3Jlc29sdmVyLT5sb29rdXBO YW1lc3BhY2VVUkkocU5hbWUubGVmdChjb2xvbikpOworICAgICAgICBpZiAobmFtZXNwYWNlVVJJ LmlzTnVsbCgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBsb2NhbE5hbWUg PSBxTmFtZS5zdWJzdHJpbmcoY29sb24gKyAxKTsKKyAgICB9IGVsc2UKKyAgICAgICAgbG9jYWxO YW1lID0gcU5hbWU7CisgICAgCisgICAgcmV0dXJuIHRydWU7Cit9CisKIEV4cHJlc3Npb24qIFBh cnNlcjo6cGFyc2VTdGF0ZW1lbnQoY29uc3QgU3RyaW5nJiBzdGF0ZW1lbnQsIFBhc3NSZWZQdHI8 WFBhdGhOU1Jlc29sdmVyPiByZXNvbHZlciwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgcmVz ZXQoc3RhdGVtZW50KTsKSW5kZXg6IFdlYkNvcmUveG1sL1hQYXRoUGFyc2VyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS94bWwvWFBhdGhQYXJzZXIuaAkocmV2aXNpb24gMTk2MDcpCisrKyBXZWJD b3JlL3htbC9YUGF0aFBhcnNlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2Myw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIFBhcnNlcigpOwogCiAgICAgICAgICAgICBY UGF0aE5TUmVzb2x2ZXIqIHJlc29sdmVyKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvbHZlci5nZXQo KTsgfQorICAgICAgICAgICAgYm9vbCBleHBhbmRRTmFtZShjb25zdCBTdHJpbmcmIHFOYW1lLCBT dHJpbmcmIGxvY2FsTmFtZSwgU3RyaW5nJiBuYW1lc3BhY2VVUkkpOworCiAgICAgICAgICAgICBF eHByZXNzaW9uKiBwYXJzZVN0YXRlbWVudChjb25zdCBTdHJpbmcmIHN0YXRlbWVudCwgUGFzc1Jl ZlB0cjxYUGF0aE5TUmVzb2x2ZXI+LCBFeGNlcHRpb25Db2RlJik7CiAKICAgICAgICAgICAgIHN0 YXRpYyBQYXJzZXIqIGN1cnJlbnQoKSB7IHJldHVybiBjdXJyZW50UGFyc2VyOyB9CkBAIC03MSw3 ICs3Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICAgICAgRXhwcmVzc2lvbiog bV90b3BFeHByOwogICAgICAgICAgICAgYm9vbCBtX2dvdE5hbWVzcGFjZUVycm9yOwotICAgICAg ICAgICAgU3RyaW5nIG1fY3VycmVudE5hbWVzcGFjZVVSSTsKIAogICAgICAgICAgICAgdm9pZCBy ZWdpc3RlclBhcnNlTm9kZShQYXJzZU5vZGUqKTsKICAgICAgICAgICAgIHZvaWQgdW5yZWdpc3Rl clBhcnNlTm9kZShQYXJzZU5vZGUqKTsKSW5kZXg6IFdlYkNvcmUveG1sL1hQYXRoU3RlcC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS94bWwvWFBhdGhTdGVwLmNwcAkocmV2aXNpb24gMTk2MDcp CisrKyBXZWJDb3JlL3htbC9YUGF0aFN0ZXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEs NyBAQAogLyoKICAqIENvcHlyaWdodCAyMDA1IEZyZXJpY2ggUmFhYmUgPHJhYWJlQGtkZS5vcmc+ CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYgQXBwbGUgQ29tcHV0ZXIsIEluYy4KKyAqIENvcHlyaWdo dCAoQykgMjAwNyBBbGV4ZXkgUHJvc2t1cnlha292IDxhcEB3ZWJraXQub3JnPgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zOCwxMiArMzksMTggQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogbmFtZXNwYWNlIFhQYXRoIHsKIAogU3RlcDo6U3RlcChBeGlzIGF4aXMsIGNvbnN0IFN0 cmluZyYgbm9kZVRlc3QsIGNvbnN0IFZlY3RvcjxQcmVkaWNhdGUqPiYgcHJlZGljYXRlcykKLSAg ICA6IG1fYXhpcyhheGlzKSwgbV9ub2RlVGVzdChub2RlVGVzdCksIG1fcHJlZGljYXRlcyhwcmVk aWNhdGVzKQorICAgIDogbV9heGlzKGF4aXMpCisgICAgLCBtX25vZGVUZXN0KG5vZGVUZXN0KQor ICAgICwgbV9wcmVkaWNhdGVzKHByZWRpY2F0ZXMpCit7Cit9CisKK1N0ZXA6OlN0ZXAoQXhpcyBh eGlzLCBjb25zdCBTdHJpbmcmIG5vZGVUZXN0LCBjb25zdCBTdHJpbmcmIG5hbWVzcGFjZVVSSSwg Y29uc3QgVmVjdG9yPFByZWRpY2F0ZSo+JiBwcmVkaWNhdGVzKQorICAgIDogbV9heGlzKGF4aXMp CisgICAgLCBtX25vZGVUZXN0KG5vZGVUZXN0KQorICAgICwgbV9uYW1lc3BhY2VVUkkobmFtZXNw YWNlVVJJKQorICAgICwgbV9wcmVkaWNhdGVzKHByZWRpY2F0ZXMpCiB7Ci0gICAgUGFyc2VyKiBw YXJzZXIgPSBQYXJzZXI6OmN1cnJlbnQoKTsKLSAgICBBU1NFUlQocGFyc2VyKTsKLSAgICBtX25h bWVzcGFjZVVSSSA9IHBhcnNlci0+bV9jdXJyZW50TmFtZXNwYWNlVVJJOwotICAgIHBhcnNlci0+ bV9jdXJyZW50TmFtZXNwYWNlVVJJID0gU3RyaW5nKCk7CiB9CiAKIFN0ZXA6On5TdGVwKCkKSW5k ZXg6IFdlYkNvcmUveG1sL1hQYXRoU3RlcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUveG1sL1hQ YXRoU3RlcC5oCShyZXZpc2lvbiAxOTYwNykKKysrIFdlYkNvcmUveG1sL1hQYXRoU3RlcC5oCSh3 b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgICAgIH07CiAKICAgICAgICAgICAgIFN0ZXAoQXhpcywgY29uc3QgU3RyaW5nJiBub2RlVGVz dCwgY29uc3QgVmVjdG9yPFByZWRpY2F0ZSo+JiBwcmVkaWNhdGVzID0gVmVjdG9yPFByZWRpY2F0 ZSo+KCkpOworICAgICAgICAgICAgU3RlcChBeGlzLCBjb25zdCBTdHJpbmcmIG5vZGVUZXN0LCBj b25zdCBTdHJpbmcmIG5hbWVzcGFjZVVSSSwgY29uc3QgVmVjdG9yPFByZWRpY2F0ZSo+JiBwcmVk aWNhdGVzID0gVmVjdG9yPFByZWRpY2F0ZSo+KCkpOwogICAgICAgICAgICAgflN0ZXAoKTsKIAog ICAgICAgICAgICAgTm9kZVZlY3RvciBldmFsdWF0ZShOb2RlKiBjb250ZXh0KSBjb25zdDsK