41838 2010-07-08 01:14:27 -0700 Unwrap a few || blocks for easier readability 2010-07-08 23:59:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth commit-queue oldest_to_newest 248061 0 eric 2010-07-08 01:14:27 -0700 Unwrap a few || blocks for easier readability 248063 1 60849 eric 2010-07-08 01:15:38 -0700 Created attachment 60849 Patch 248268 2 60849 abarth 2010-07-08 09:32:44 -0700 Comment on attachment 60849 Patch WebCore/html/HTMLTreeBuilder.cpp:614 + || token.name() == "details" We need to atomize these 248781 3 60849 commit-queue 2010-07-08 23:58:58 -0700 Comment on attachment 60849 Patch Clearing flags on attachment: 60849 Committed r62901: <http://trac.webkit.org/changeset/62901> 248782 4 commit-queue 2010-07-08 23:59:02 -0700 All reviewed patches have been landed. Closing bug. 60849 2010-07-08 01:15:38 -0700 2010-07-08 23:58:58 -0700 Patch bug-41838-20100708011537.patch text/plain 12337 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjNjMmQwYjZhYTJiOGQ5YTkzYTBjMTY1M2RiMTljM2FmMjQwNTBhYS4uZDYzMWM5NWY3OWQxN2Jm MmJjZjQxN2UzYzIzYjg0OWZlYTU1MDdmOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNy0wOCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVW53cmFwIGEgZmV3IHx8IGJsb2NrcyBmb3IgZWFzaWVyIHJl YWRhYmlsaXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MTgzOAorCisgICAgICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlLCB0aHVzIG5vIHRlc3RzLgor CisgICAgICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFRyZWVCdWlsZGVyOjphZGp1c3RlZExleGVyU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJbkJvZHkpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJblRhYmxlKToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKToKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZ0ZvckluQm9keSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzQ29tbWVudCk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluSGVhZCk6CisKIDIwMTAt MDctMDcgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTmF0ZSBDaGFwaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCmluZGV4 IDRmNmJjOWM2MmQzYjcyMWE3Y2JjMTVjYmI5NDJiZTk3Y2M5MmU2MWIuLjliZTVlYThiM2JlMTlm NjMzYjBmOTYxMDE0Mjc1OWNhZGRlMDFjODMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBA IC0zNDcsOCArMzQ3LDEyIEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUcmVlQnVpbGRlcjo6 YWRqdXN0ZWRMZXhlclN0YXRlKEhUTUxUb2tlbml6ZXI6OlN0YXRlIHN0CiAgICAgaWYgKHRhZ05h bWUgPT0gdGV4dGFyZWFUYWcgfHwgdGFnTmFtZSA9PSB0aXRsZVRhZykKICAgICAgICAgcmV0dXJu IEhUTUxUb2tlbml6ZXI6OlJDREFUQVN0YXRlOwogCi0gICAgaWYgKHRhZ05hbWUgPT0gc3R5bGVU YWcgfHwgdGFnTmFtZSA9PSBpZnJhbWVUYWcgfHwgdGFnTmFtZSA9PSB4bXBUYWcgfHwgdGFnTmFt ZSA9PSBub2VtYmVkVGFnCi0gICAgICAgIHx8IHRhZ05hbWUgPT0gbm9mcmFtZXNUYWcgfHwgKHRh Z05hbWUgPT0gbm9zY3JpcHRUYWcgJiYgaXNTY3JpcHRpbmdGbGFnRW5hYmxlZChmcmFtZSkpKQor ICAgIGlmICh0YWdOYW1lID09IHN0eWxlVGFnCisgICAgICAgIHx8IHRhZ05hbWUgPT0gaWZyYW1l VGFnCisgICAgICAgIHx8IHRhZ05hbWUgPT0geG1wVGFnCisgICAgICAgIHx8IHRhZ05hbWUgPT0g bm9lbWJlZFRhZworICAgICAgICB8fCB0YWdOYW1lID09IG5vZnJhbWVzVGFnCisgICAgICAgIHx8 ICh0YWdOYW1lID09IG5vc2NyaXB0VGFnICYmIGlzU2NyaXB0aW5nRmxhZ0VuYWJsZWQoZnJhbWUp KSkKICAgICAgICAgcmV0dXJuIEhUTUxUb2tlbml6ZXI6OlJBV1RFWFRTdGF0ZTsKIAogICAgIGlm ICh0YWdOYW1lID09IHBsYWludGV4dFRhZykKQEAgLTUzOSw3ICs1NDMsOCBAQCBib29sIGlzTGko Y29uc3QgRWxlbWVudCogZWxlbWVudCkKIAogYm9vbCBpc0RkT3JEdChjb25zdCBFbGVtZW50KiBl bGVtZW50KQogewotICAgIHJldHVybiBlbGVtZW50LT5oYXNUYWdOYW1lKGRkVGFnKSB8fCBlbGVt ZW50LT5oYXNUYWdOYW1lKGR0VGFnKTsKKyAgICByZXR1cm4gZWxlbWVudC0+aGFzVGFnTmFtZShk ZFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShkdFRhZyk7CiB9CiAKIH0KQEAg LTU3MCw3ICs1NzUsMTQgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0Zv ckluQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBtX3RyZWUuaW5zZXJ0SFRN TEh0bWxTdGFydFRhZ0luQm9keSh0b2tlbik7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAg aWYgKHRva2VuLm5hbWUoKSA9PSBiYXNlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSAiY29tbWFuZCIg fHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcgfHwgdG9rZW4ubmFtZSgpID09IG1ldGFUYWcgfHwg dG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzY3JpcHRUYWcg fHwgdG9rZW4ubmFtZSgpID09IHN0eWxlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0aXRsZVRhZykg eworICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYmFzZVRhZworICAgICAgICB8fCB0b2tlbi5uYW1l KCkgPT0gImNvbW1hbmQiCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBsaW5rVGFnCisgICAg ICAgIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9 PSBub2ZyYW1lc1RhZworICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gc2NyaXB0VGFnCisgICAg ICAgIHx8IHRva2VuLm5hbWUoKSA9PSBzdHlsZVRhZworICAgICAgICB8fCB0b2tlbi5uYW1lKCkg PT0gdGl0bGVUYWcpIHsKICAgICAgICAgYm9vbCBkaWRQcm9jZXNzID0gcHJvY2Vzc1N0YXJ0VGFn Rm9ySW5IZWFkKHRva2VuKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChkaWRQcm9jZXNzLCBkaWRQ cm9jZXNzKTsKICAgICAgICAgcmV0dXJuOwpAQCAtNTk0LDcgKzYwNiwyNiBAQCB2b2lkIEhUTUxU cmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9r ZW4pCiAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluRnJhbWVzZXRNb2RlOwogICAgICAgICBy ZXR1cm47CiAgICAgfQotICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYWRkcmVzc1RhZyB8fCB0b2tl bi5uYW1lKCkgPT0gYXJ0aWNsZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gYXNpZGVUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGJsb2NrcXVvdGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNlbnRlclRhZyB8 fCB0b2tlbi5uYW1lKCkgPT0gImRldGFpbHMiIHx8IHRva2VuLm5hbWUoKSA9PSBkaXJUYWcgfHwg dG9rZW4ubmFtZSgpID09IGRpdlRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gZGxUYWcgfHwgdG9rZW4u bmFtZSgpID09IGZpZWxkc2V0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSAiZmlndXJlIiB8fCB0b2tl bi5uYW1lKCkgPT0gZm9vdGVyVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBoZWFkZXJUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGhncm91cFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbWVudVRhZyB8fCB0b2tl bi5uYW1lKCkgPT0gbmF2VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBvbFRhZyB8fCB0b2tlbi5uYW1l KCkgPT0gcFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gc2VjdGlvblRhZyB8fCB0b2tlbi5uYW1lKCkg PT0gdWxUYWcpIHsKKyAgICBpZiAodG9rZW4ubmFtZSgpID09IGFkZHJlc3NUYWcKKyAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IGFydGljbGVUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IGFzaWRlVGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBibG9ja3F1b3RlVGFnCisgICAg ICAgIHx8IHRva2VuLm5hbWUoKSA9PSBjZW50ZXJUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgp ID09ICJkZXRhaWxzIgorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZGlyVGFnCisgICAgICAg IHx8IHRva2VuLm5hbWUoKSA9PSBkaXZUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGRs VGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBmaWVsZHNldFRhZworICAgICAgICB8fCB0 b2tlbi5uYW1lKCkgPT0gImZpZ3VyZSIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGZvb3Rl clRhZworICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gaGVhZGVyVGFnCisgICAgICAgIHx8IHRv a2VuLm5hbWUoKSA9PSBoZ3JvdXBUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG1lbnVU YWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG5hdlRhZworICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gb2xUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHBUYWcKKyAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IHNlY3Rpb25UYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IHVsVGFnKSB7CiAgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluU2NvcGUoKTsKICAgICAg ICAgbV90cmVlLmluc2VydEVsZW1lbnQodG9rZW4pOwogICAgICAgICByZXR1cm47CkBAIC02Nzks NyArNzEwLDkgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9k eShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBtX3RyZWUuaW5zZXJ0Rm9ybWF0dGlu Z0VsZW1lbnQodG9rZW4pOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlmICh0b2tlbi5u YW1lKCkgPT0gYXBwbGV0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBtYXJxdWVlVGFnIHx8IHRva2Vu Lm5hbWUoKSA9PSBvYmplY3RUYWcpIHsKKyAgICBpZiAodG9rZW4ubmFtZSgpID09IGFwcGxldFRh ZworICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbWFycXVlZVRhZworICAgICAgICB8fCB0b2tl bi5uYW1lKCkgPT0gb2JqZWN0VGFnKSB7CiAgICAgICAgIG1fdHJlZS5yZWNvbnN0cnVjdFRoZUFj dGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpOwogICAgICAgICBtX3RyZWUuaW5zZXJ0RWxlbWVudCh0 b2tlbik7CiAgICAgICAgIG1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+YXBwZW5k TWFya2VyKCk7CkBAIC03MDAsMTMgKzczMywyMyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIHRv a2VuLnNldE5hbWUoaW1nVGFnLmxvY2FsTmFtZSgpKTsKICAgICAgICAgLy8gTm90ZSB0aGUgZmFs bCB0aHJvdWdoIHRvIHRoZSBpbWdUYWcgaGFuZGxpbmcgYmVsb3chCiAgICAgfQotICAgIGlmICh0 b2tlbi5uYW1lKCkgPT0gYXJlYVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gYmFzZWZvbnRUYWcgfHwg dG9rZW4ubmFtZSgpID09ICJiZ3NvdW5kIiB8fCB0b2tlbi5uYW1lKCkgPT0gYnJUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGVtYmVkVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBpbWdUYWcgfHwgdG9rZW4u bmFtZSgpID09IGlucHV0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBrZXlnZW5UYWcgfHwgdG9rZW4u bmFtZSgpID09IHdiclRhZykgeworICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYXJlYVRhZworICAg ICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmFzZWZvbnRUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFt ZSgpID09ICJiZ3NvdW5kIgorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYnJUYWcKKyAgICAg ICAgfHwgdG9rZW4ubmFtZSgpID09IGVtYmVkVGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9 PSBpbWdUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGlucHV0VGFnCisgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBrZXlnZW5UYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHdi clRhZykgewogICAgICAgICBtX3RyZWUucmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3JtYXR0aW5nRWxl bWVudHMoKTsKICAgICAgICAgbV90cmVlLmluc2VydFNlbGZDbG9zaW5nRWxlbWVudCh0b2tlbik7 CiAgICAgICAgIG1fZnJhbWVzZXRPayA9IGZhbHNlOwogICAgICAgICByZXR1cm47CiAgICAgfQot ICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gcGFyYW1UYWcgfHwgdG9rZW4ubmFtZSgpID09IHNvdXJj ZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gInRyYWNrIikgeworICAgIGlmICh0b2tlbi5uYW1lKCkg PT0gcGFyYW1UYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHNvdXJjZVRhZworICAgICAg ICB8fCB0b2tlbi5uYW1lKCkgPT0gInRyYWNrIikgewogICAgICAgICBtX3RyZWUuaW5zZXJ0U2Vs ZkNsb3NpbmdFbGVtZW50KHRva2VuKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTc1Myw3 ICs3OTYsMTIgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9k eShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBtX3RyZWUucmVjb25zdHJ1Y3RUaGVB Y3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKTsKICAgICAgICAgbV90cmVlLmluc2VydEVsZW1lbnQo dG9rZW4pOwogICAgICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKLSAgICAgICAgaWYgKG1faW5z ZXJ0aW9uTW9kZSA9PSBJblRhYmxlTW9kZSB8fCBtX2luc2VydGlvbk1vZGUgPT0gSW5DYXB0aW9u TW9kZSB8fCBtX2luc2VydGlvbk1vZGUgPT0gSW5Db2x1bW5Hcm91cE1vZGUgfHwgbV9pbnNlcnRp b25Nb2RlID09IEluVGFibGVCb2R5TW9kZSB8fCBtX2luc2VydGlvbk1vZGUgPT0gSW5Sb3dNb2Rl IHx8IG1faW5zZXJ0aW9uTW9kZSA9PSBJbkNlbGxNb2RlKQorICAgICAgICBpZiAobV9pbnNlcnRp b25Nb2RlID09IEluVGFibGVNb2RlCisgICAgICAgICAgICAgfHwgbV9pbnNlcnRpb25Nb2RlID09 IEluQ2FwdGlvbk1vZGUKKyAgICAgICAgICAgICB8fCBtX2luc2VydGlvbk1vZGUgPT0gSW5Db2x1 bW5Hcm91cE1vZGUKKyAgICAgICAgICAgICB8fCBtX2luc2VydGlvbk1vZGUgPT0gSW5UYWJsZUJv ZHlNb2RlCisgICAgICAgICAgICAgfHwgbV9pbnNlcnRpb25Nb2RlID09IEluUm93TW9kZQorICAg ICAgICAgICAgIHx8IG1faW5zZXJ0aW9uTW9kZSA9PSBJbkNlbGxNb2RlKQogICAgICAgICAgICAg bV9pbnNlcnRpb25Nb2RlID0gSW5TZWxlY3RJblRhYmxlTW9kZTsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5TZWxlY3RNb2RlOwpAQCAtODU0LDcgKzkwMiw4 IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJblRhYmxlKEF0b21p Y0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluVGFibGVCb2R5 TW9kZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBpZiAoaXNUYWJsZUNlbGxDb250ZXh0 VGFnKHRva2VuLm5hbWUoKSkgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnKSB7CisgICAgaWYgKGlz VGFibGVDZWxsQ29udGV4dFRhZyh0b2tlbi5uYW1lKCkpCisgICAgICAgIHx8IHRva2VuLm5hbWUo KSA9PSB0clRhZykgewogICAgICAgICBwcm9jZXNzRmFrZVN0YXJ0VGFnKHRib2R5VGFnKTsKICAg ICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblRhYmxlQm9keU1vZGUpOwogICAgICAg ICBwcm9jZXNzU3RhcnRUYWcodG9rZW4pOwpAQCAtOTQ3LDcgKzk5NiwxMyBAQCB2b2lkIEhUTUxU cmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAg ICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEluRnJhbWVzZXRNb2RlKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJhc2VUYWcgfHwg dG9rZW4ubmFtZSgpID09IGxpbmtUYWcgfHwgdG9rZW4ubmFtZSgpID09IG1ldGFUYWcgfHwgdG9r ZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzY3JpcHRUYWcgfHwg dG9rZW4ubmFtZSgpID09IHN0eWxlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0aXRsZVRhZykgewor ICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJhc2VUYWcKKyAgICAgICAgICAgIHx8IHRva2Vu Lm5hbWUoKSA9PSBsaW5rVGFnCisgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRh ZworICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnCisgICAgICAgICAg ICB8fCB0b2tlbi5uYW1lKCkgPT0gc2NyaXB0VGFnCisgICAgICAgICAgICB8fCB0b2tlbi5uYW1l KCkgPT0gc3R5bGVUYWcKKyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSB0aXRsZVRhZykg ewogICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CiAgICAgICAgICAgICBBU1NFUlQobV90 cmVlLmhlYWQoKSk7CiAgICAgICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnB1c2hIVE1M SGVhZEVsZW1lbnQobV90cmVlLmhlYWQoKSk7CkBAIC0xMDg3LDcgKzExNDIsMTAgQEAgdm9pZCBI VE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQog ICAgICAgICAgICAgbV90cmVlLmluc2VydEhUTUxIdG1sU3RhcnRUYWdJbkJvZHkodG9rZW4pOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkg PT0gbGlua1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0g bm9mcmFtZXNUYWcgfHwgdG9rZW4ubmFtZSgpID09IHN0eWxlVGFnKSB7CisgICAgICAgIGlmICh0 b2tlbi5uYW1lKCkgPT0gbGlua1RhZworICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG1l dGFUYWcKKyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBub2ZyYW1lc1RhZworICAgICAg ICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHN0eWxlVGFnKSB7CiAgICAgICAgICAgICBib29sIGRp ZFByb2Nlc3MgPSBwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQodG9rZW4pOwogICAgICAgICAgICAg QVNTRVJUX1VOVVNFRChkaWRQcm9jZXNzLCBkaWRQcm9jZXNzKTsKICAgICAgICAgICAgIHJldHVy bjsKQEAgLTExNzgsNyArMTIzNiw5IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3Rh cnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgIHByb2Nlc3NFbmRUYWco ZW5kU2VsZWN0KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAo dG9rZW4ubmFtZSgpID09IGlucHV0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBrZXlnZW5UYWcgfHwg dG9rZW4ubmFtZSgpID09IHRleHRhcmVhVGFnKSB7CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkg PT0gaW5wdXRUYWcKKyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBrZXlnZW5UYWcKKyAg ICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSB0ZXh0YXJlYVRhZykgewogICAgICAgICAgICAg cGFyc2VFcnJvcih0b2tlbik7CiAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOyAvLyBmcmFn bWVudCBjYXNlCiAgICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kU2VsZWN0KEhUTUxUb2tl bjo6RW5kVGFnLCBzZWxlY3RUYWcubG9jYWxOYW1lKCkpOwpAQCAtMTUyOCw3ICsxNTg4LDggQEAg dm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KLSAgICBpZiAodG9rZW4ubmFtZSgpID09IGRkVGFnIHx8IHRva2Vu Lm5hbWUoKSA9PSBkdFRhZykgeworICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gZGRUYWcKKyAgICAg ICAgfHwgdG9rZW4ubmFtZSgpID09IGR0VGFnKSB7CiAgICAgICAgIGlmICghbV90cmVlLm9wZW5F bGVtZW50cygpLT5pblNjb3BlKHRva2VuLm5hbWUoKSkpIHsKICAgICAgICAgICAgIHBhcnNlRXJy b3IodG9rZW4pOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTU2MCw3ICsxNjIxLDkgQEAgdm9p ZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2Vu JiB0b2tlbikKICAgICAgICAgY2FsbFRoZUFkb3B0aW9uQWdlbmN5KHRva2VuKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSAgICBpZiAodG9rZW4ubmFtZSgpID09IGFwcGxldFRhZyB8fCB0b2tl bi5uYW1lKCkgPT0gbWFycXVlZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gb2JqZWN0VGFnKSB7Cisg ICAgaWYgKHRva2VuLm5hbWUoKSA9PSBhcHBsZXRUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgp ID09IG1hcnF1ZWVUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG9iamVjdFRhZykgewog ICAgICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5TY29wZSh0b2tlbi5uYW1lKCkp KSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIHJldHVybjsK QEAgLTE3OTgsNyArMTg2MSw5IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFn KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4ubmFtZSgp ID09IHRhYmxlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0clRhZyB8fCBpc1RhYmxlQm9keUNvbnRl eHRUYWcodG9rZW4ubmFtZSgpKSkgeworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRhYmxl VGFnCisgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gdHJUYWcKKyAgICAgICAgICAgIHx8 IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpKSB7CiAgICAgICAgICAgICBpZiAo IW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRva2VuLm5hbWUoKSkpIHsKICAg ICAgICAgICAgICAgICBBU1NFUlQobV9pc1BhcnNpbmdGcmFnbWVudCk7CiAgICAgICAgICAgICAg ICAgLy8gRklYTUU6IEl0IGlzIHVuY2xlYXIgd2hhdCB0aGUgZXhhY3QgQVNTRVJUIHNob3VsZCBi ZS4KQEAgLTE5NzEsNyArMjAzNiwxMCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0Vu ZFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NDb21tZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiB7CiAgICAgQVNTRVJUKHRva2VuLnR5 cGUoKSA9PSBIVE1MVG9rZW46OkNvbW1lbnQpOwotICAgIGlmIChtX2luc2VydGlvbk1vZGUgPT0g SW5pdGlhbE1vZGUgfHwgbV9pbnNlcnRpb25Nb2RlID09IEJlZm9yZUhUTUxNb2RlIHx8IG1faW5z ZXJ0aW9uTW9kZSA9PSBBZnRlckFmdGVyQm9keU1vZGUgfHwgbV9pbnNlcnRpb25Nb2RlID09IEFm dGVyQWZ0ZXJGcmFtZXNldE1vZGUpIHsKKyAgICBpZiAobV9pbnNlcnRpb25Nb2RlID09IEluaXRp YWxNb2RlCisgICAgICAgIHx8IG1faW5zZXJ0aW9uTW9kZSA9PSBCZWZvcmVIVE1MTW9kZQorICAg ICAgICB8fCBtX2luc2VydGlvbk1vZGUgPT0gQWZ0ZXJBZnRlckJvZHlNb2RlCisgICAgICAgIHx8 IG1faW5zZXJ0aW9uTW9kZSA9PSBBZnRlckFmdGVyRnJhbWVzZXRNb2RlKSB7CiAgICAgICAgIG1f dHJlZS5pbnNlcnRDb21tZW50T25Eb2N1bWVudCh0b2tlbik7CiAgICAgICAgIHJldHVybjsKICAg ICB9CkBAIC0yMTg0LDcgKzIyNTIsMTAgQEAgYm9vbCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NT dGFydFRhZ0ZvckluSGVhZChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAgICAgLy8gRklYTUU6IEF0b21pemUgImNvbW1hbmQiLgotICAgIGlmICh0 b2tlbi5uYW1lKCkgPT0gYmFzZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gImNvbW1hbmQiIHx8IHRv a2VuLm5hbWUoKSA9PSBsaW5rVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnKSB7CisgICAg aWYgKHRva2VuLm5hbWUoKSA9PSBiYXNlVGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAi Y29tbWFuZCIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcKKyAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IG1ldGFUYWcpIHsKICAgICAgICAgbV90cmVlLmluc2VydFNlbGZDbG9z aW5nRWxlbWVudCh0b2tlbik7CiAgICAgICAgIC8vIE5vdGU6IFRoZSBjdXN0b20gcHJvY2Vzc2lu ZyBmb3IgdGhlIDxtZXRhPiB0YWcgaXMgZG9uZSBpbiBIVE1MTWV0YUVsZW1lbnQ6OnByb2Nlc3Mo KS4KICAgICAgICAgcmV0dXJuIHRydWU7Cg==