104009 2012-12-04 09:37:06 -0800 Add an helper function in CSSParser to check for '/' character. 2012-12-04 11:34:35 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 menard menard benjamin cmarcelo dbates jchaffraix macpherson ojan webkit.review.bot oldest_to_newest 782608 0 menard 2012-12-04 09:37:06 -0800 Add an helper function in CSSParser to check for '/' character. 782613 1 177500 menard 2012-12-04 09:39:34 -0800 Created attachment 177500 Patch 782656 2 177500 rniwa 2012-12-04 10:10:18 -0800 Comment on attachment 177500 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177500&action=review > Source/WebCore/css/CSSParser.cpp:1655 > +static inline bool isSlash(CSSParserValue* value) We might want to call this isOperatorSlash or some other CSS-spec terminology. 782659 3 177505 menard 2012-12-04 10:13:57 -0800 Created attachment 177505 Patch 782677 4 dbates 2012-12-04 10:23:48 -0800 We should look to rename BorderImageParseContext::{allow, commit}Slash to be consistent with the naming of "isForwardSlashOperator". For completeness, the paragraph under Example 22 in <http://www.w3.org/TR/css3-background/> (24 July 2012) references the forward slash character as "slash" with respect to the shorthand border-radius property. 782678 5 menard 2012-12-04 10:26:42 -0800 Committed r136525: <http://trac.webkit.org/changeset/136525> 782682 6 177505 darin 2012-12-04 10:35:10 -0800 Comment on attachment 177505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177505&action=review > Source/WebCore/css/CSSParser.cpp:1657 > + return value && value->unit == CSSParserValue::Operator && value->iValue == '/'; This adds an extra null check. Seems like an unwanted change. Maybe make this take a CSSParserValue& and put * characters at the call sites? Or just leave out the null check? Or replace it with an assertion? 782700 7 177505 menard 2012-12-04 10:47:59 -0800 Comment on attachment 177505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177505&action=review >> Source/WebCore/css/CSSParser.cpp:1657 >> + return value && value->unit == CSSParserValue::Operator && value->iValue == '/'; > > This adds an extra null check. Seems like an unwanted change. Maybe make this take a CSSParserValue& and put * characters at the call sites? Or just leave out the null check? Or replace it with an assertion? I can just remove it sure so we keep the same behavior as before. 782714 8 menard 2012-12-04 10:55:19 -0800 (In reply to comment #7) > (From update of attachment 177505 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177505&action=review > > >> Source/WebCore/css/CSSParser.cpp:1657 > >> + return value && value->unit == CSSParserValue::Operator && value->iValue == '/'; > > > > This adds an extra null check. Seems like an unwanted change. Maybe make this take a CSSParserValue& and put * characters at the call sites? Or just leave out the null check? Or replace it with an assertion? > > I can just remove it sure so we keep the same behavior as before. Should I rollout / reupload the patch here? Or I just commit leaving out the null check? 782737 9 177505 rniwa 2012-12-04 11:16:58 -0800 Comment on attachment 177505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177505&action=review >>>> Source/WebCore/css/CSSParser.cpp:1657 >>>> + return value && value->unit == CSSParserValue::Operator && value->iValue == '/'; >>> >>> This adds an extra null check. Seems like an unwanted change. Maybe make this take a CSSParserValue& and put * characters at the call sites? Or just leave out the null check? Or replace it with an assertion? >> >> I can just remove it sure so we keep the same behavior as before. > > Should I rollout / reupload the patch here? Or I just commit leaving out the null check? Oh oops, I didn’t realize that. Please remove value && and replace it with ASSERT(value) although looking at validWidth, we don’t have assertions like that elsewhere :/ 782754 10 menard 2012-12-04 11:34:35 -0800 (In reply to comment #9) > (From update of attachment 177505 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177505&action=review > > >>>> Source/WebCore/css/CSSParser.cpp:1657 > >>>> + return value && value->unit == CSSParserValue::Operator && value->iValue == '/'; > >>> > >>> This adds an extra null check. Seems like an unwanted change. Maybe make this take a CSSParserValue& and put * characters at the call sites? Or just leave out the null check? Or replace it with an assertion? > >> > >> I can just remove it sure so we keep the same behavior as before. > > > > Should I rollout / reupload the patch here? Or I just commit leaving out the null check? > > Oh oops, I didn’t realize that. Please remove value && and replace it with ASSERT(value) although looking at validWidth, we don’t have assertions like that elsewhere :/ Landed with http://trac.webkit.org/changeset/136540 . Unfortunately webkit-patch did not do the right thing as https://bugs.webkit.org/show_bug.cgi?id=40652. Sorry about that. 177500 2012-12-04 09:39:34 -0800 2012-12-04 10:13:51 -0800 Patch bug-104009-20121204143658.patch text/plain 3442 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM1YWExM2FhMTEyNTVm ZDA5NjM3Y2U2YjY3MzM3MDU3NjY4NmRhYi4uMDk3YTA3Mzc0YWNhNTk4ZmNkYzU1OWYyMTJjOTNi M2I1YTczYjA2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTA0ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIGhlbHBlciBm dW5jdGlvbiBpbiBDU1NQYXJzZXIgdG8gY2hlY2sgZm9yICcvJyBjaGFyYWN0ZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQwMDkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJJ20gYWJvdXQgdG8gYWRk IHRoZSBzYW1lIHBhdHRlcm4gaW4gYSBmb2xsb3dpbmcgcGF0Y2guIExldCdzIGRvIGFuCisgICAg ICAgIGhlbHBlciBmdW5jdGlvbiBmaXJzdC4gV2UgYWxzbyBkaWQgdGhhdCBmb3IgdGhlIGNvbW1h LiBUaGUgc2xhc2gKKyAgICAgICAgY2hhcmFjdGVyIGlzIHByZXR0eSB1c2VkIGluIHNob3J0aGFu ZHMgZGVmaW5pdGlvbnMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIDoganVzdCBhIHJlZmFjdG9y LCBleGlzdGluZyB0ZXN0cyBzaG91bGQgY292ZXIuCisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzU2xhc2gpOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRmlsbFNob3J0aGFuZCk6CisgICAgICAg IChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ YXJzZXI6OnBhcnNlQm9yZGVySW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpw YXJzZUFzcGVjdFJhdGlvKToKKwogMjAxMi0xMi0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVXNlIGEgcHJpdmF0ZSBzdHJ1Y3Qg YW5kIHBsYWNlbWVudCBuZXcgc3ludGF4IGluIEdPYmplY3QgRE9NIGJpbmRpbmdzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQYXJzZXIuY3BwCmluZGV4IDNhYmU5YjVhY2UwOGQxZjI1MzZhMDljOTY2ZjM2ZjliNDRl ZWI2ZWMuLjgyZDVkYzE3MjU5ZjJmM2YwYTE5ODEyYzdiYTNhZjJkMDhmMGQyOWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC0xNjUyLDYgKzE2NTIsMTEgQEAgc3RhdGljIGlubGluZSBi b29sIGlzQ29tbWEoQ1NTUGFyc2VyVmFsdWUqIHZhbHVlKQogICAgIHJldHVybiB2YWx1ZSAmJiB2 YWx1ZS0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6T3BlcmF0b3IgJiYgdmFsdWUtPmlWYWx1ZSA9 PSAnLCc7IAogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNTbGFzaChDU1NQYXJzZXJWYWx1ZSog dmFsdWUpCit7CisgICAgcmV0dXJuIHZhbHVlICYmIHZhbHVlLT51bml0ID09IENTU1BhcnNlclZh bHVlOjpPcGVyYXRvciAmJiB2YWx1ZS0+aVZhbHVlID09ICcvJzsKK30KKwogYm9vbCBDU1NQYXJz ZXI6OnZhbGlkV2lkdGgoQ1NTUGFyc2VyVmFsdWUqIHZhbHVlKQogewogICAgIGludCBpZCA9IHZh bHVlLT5pZDsKQEAgLTMwMDEsNyArMzAwNiw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUZpbGxT aG9ydGhhbmQoQ1NTUHJvcGVydHlJRCBwcm9wSWQsIGNvbnN0IENTU1Byb3BlcnR5SUQqIHByCiAg ICAgICAgIH0KIAogICAgICAgICBib29sIHNpemVDU1NQcm9wZXJ0eUV4cGVjdGVkID0gZmFsc2U7 Ci0gICAgICAgIGlmICgodmFsLT51bml0ID09IENTU1BhcnNlclZhbHVlOjpPcGVyYXRvciAmJiB2 YWwtPmlWYWx1ZSA9PSAnLycpICYmIGZvdW5kUG9zaXRpb25DU1NQcm9wZXJ0eSkgeworICAgICAg ICBpZiAoaXNTbGFzaCh2YWwpICYmIGZvdW5kUG9zaXRpb25DU1NQcm9wZXJ0eSkgewogICAgICAg ICAgICAgc2l6ZUNTU1Byb3BlcnR5RXhwZWN0ZWQgPSB0cnVlOwogICAgICAgICAgICAgbV92YWx1 ZUxpc3QtPm5leHQoKTsKICAgICAgICAgfQpAQCAtNTA4MCw3ICs1MDg1LDcgQEAgYm9vbCBDU1NQ YXJzZXI6OnBhcnNlRm9udChib29sIGltcG9ydGFudCkKICAgICBpZiAoIXZhbHVlKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAodmFsdWUtPnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6 Ok9wZXJhdG9yICYmIHZhbHVlLT5pVmFsdWUgPT0gJy8nKSB7CisgICAgaWYgKGlzU2xhc2godmFs dWUpKSB7CiAgICAgICAgIC8vIFRoZSBsaW5lLWhlaWdodCBwcm9wZXJ0eS4KICAgICAgICAgdmFs dWUgPSBtX3ZhbHVlTGlzdC0+bmV4dCgpOwogICAgICAgICBpZiAoIXZhbHVlKQpAQCAtNjM3MSw3 ICs2Mzc2LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQm9yZGVySW1hZ2UoQ1NTUHJvcGVydHlJ RCBwcm9wSWQsIFJlZlB0cjxDU1NWYWx1ZT4mIHJlc3VsdCwKICAgICB3aGlsZSAoQ1NTUGFyc2Vy VmFsdWUqIHZhbCA9IG1fdmFsdWVMaXN0LT5jdXJyZW50KCkpIHsKICAgICAgICAgY29udGV4dC5z ZXRDYW5BZHZhbmNlKGZhbHNlKTsKIAotICAgICAgICBpZiAoIWNvbnRleHQuY2FuQWR2YW5jZSgp ICYmIGNvbnRleHQuYWxsb3dTbGFzaCgpICYmIHZhbC0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6 T3BlcmF0b3IgJiYgdmFsLT5pVmFsdWUgPT0gJy8nKQorICAgICAgICBpZiAoIWNvbnRleHQuY2Fu QWR2YW5jZSgpICYmIGNvbnRleHQuYWxsb3dTbGFzaCgpICYmIGlzU2xhc2godmFsKSkKICAgICAg ICAgICAgIGNvbnRleHQuY29tbWl0U2xhc2goKTsKIAogICAgICAgICBpZiAoIWNvbnRleHQuY2Fu QWR2YW5jZSgpICYmIGNvbnRleHQuYWxsb3dJbWFnZSgpKSB7CkBAIC02Nzg3LDcgKzY3OTIsNyBA QCBib29sIENTU1BhcnNlcjo6cGFyc2VBc3BlY3RSYXRpbyhib29sIGltcG9ydGFudCkKICAgICBD U1NQYXJzZXJWYWx1ZSogb3AgPSBtX3ZhbHVlTGlzdC0+dmFsdWVBdCgxKTsKICAgICBDU1NQYXJz ZXJWYWx1ZSogcnZhbHVlID0gbV92YWx1ZUxpc3QtPnZhbHVlQXQoMik7CiAKLSAgICBpZiAob3At PnVuaXQgIT0gQ1NTUGFyc2VyVmFsdWU6Ok9wZXJhdG9yIHx8IG9wLT5pVmFsdWUgIT0gJy8nKQor ICAgIGlmICghaXNTbGFzaChvcCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICgh dmFsaWRVbml0KGx2YWx1ZSwgRk51bWJlciB8IEZOb25OZWcpIHx8ICF2YWxpZFVuaXQocnZhbHVl LCBGTnVtYmVyIHwgRk5vbk5lZykpCg== 177505 2012-12-04 10:13:57 -0800 2012-12-04 11:16:58 -0800 Patch bug-104009-20121204151121.patch text/plain 3532 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM1YWExM2FhMTEyNTVm ZDA5NjM3Y2U2YjY3MzM3MDU3NjY4NmRhYi4uM2YxYzc4NTg1MGExMzE4YTRhMzRlN2NjYjIzYjMw MWU5NGZhNzY2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTA0ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIGhlbHBlciBm dW5jdGlvbiBpbiBDU1NQYXJzZXIgdG8gY2hlY2sgZm9yICcvJyBjaGFyYWN0ZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQwMDkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJJ20gYWJvdXQgdG8gYWRk IHRoZSBzYW1lIHBhdHRlcm4gaW4gYSBmb2xsb3dpbmcgcGF0Y2guIExldCdzIGRvIGFuCisgICAg ICAgIGhlbHBlciBmdW5jdGlvbiBmaXJzdC4gV2UgYWxzbyBkaWQgdGhhdCBmb3IgdGhlIGNvbW1h LiBUaGUgc2xhc2gKKyAgICAgICAgY2hhcmFjdGVyIGlzIHByZXR0eSB1c2VkIGluIHNob3J0aGFu ZHMgZGVmaW5pdGlvbnMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIDoganVzdCBhIHJlZmFjdG9y LCBleGlzdGluZyB0ZXN0cyBzaG91bGQgY292ZXIuCisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzRm9yd2FyZFNsYXNoT3BlcmF0b3IpOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRmlsbFNob3J0 aGFuZCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRm9udCk6CisgICAgICAg IChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQm9yZGVySW1hZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUGFyc2VyOjpwYXJzZUFzcGVjdFJhdGlvKToKKwogMjAxMi0xMi0wNCAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVXNlIGEg cHJpdmF0ZSBzdHJ1Y3QgYW5kIHBsYWNlbWVudCBuZXcgc3ludGF4IGluIEdPYmplY3QgRE9NIGJp bmRpbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDNhYmU5YjVhY2UwOGQxZjI1MzZh MDljOTY2ZjM2ZjliNDRlZWI2ZWMuLmU2OWFiOTZiYzUwZTkxMzkxMjM4Y2JiYjA4MWNmNDBlOGI1 Njk3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC0xNjUyLDYgKzE2NTIsMTEgQEAg c3RhdGljIGlubGluZSBib29sIGlzQ29tbWEoQ1NTUGFyc2VyVmFsdWUqIHZhbHVlKQogICAgIHJl dHVybiB2YWx1ZSAmJiB2YWx1ZS0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6T3BlcmF0b3IgJiYg dmFsdWUtPmlWYWx1ZSA9PSAnLCc7IAogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNGb3J3YXJk U2xhc2hPcGVyYXRvcihDU1NQYXJzZXJWYWx1ZSogdmFsdWUpCit7CisgICAgcmV0dXJuIHZhbHVl ICYmIHZhbHVlLT51bml0ID09IENTU1BhcnNlclZhbHVlOjpPcGVyYXRvciAmJiB2YWx1ZS0+aVZh bHVlID09ICcvJzsKK30KKwogYm9vbCBDU1NQYXJzZXI6OnZhbGlkV2lkdGgoQ1NTUGFyc2VyVmFs dWUqIHZhbHVlKQogewogICAgIGludCBpZCA9IHZhbHVlLT5pZDsKQEAgLTMwMDEsNyArMzAwNiw3 IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUZpbGxTaG9ydGhhbmQoQ1NTUHJvcGVydHlJRCBwcm9w SWQsIGNvbnN0IENTU1Byb3BlcnR5SUQqIHByCiAgICAgICAgIH0KIAogICAgICAgICBib29sIHNp emVDU1NQcm9wZXJ0eUV4cGVjdGVkID0gZmFsc2U7Ci0gICAgICAgIGlmICgodmFsLT51bml0ID09 IENTU1BhcnNlclZhbHVlOjpPcGVyYXRvciAmJiB2YWwtPmlWYWx1ZSA9PSAnLycpICYmIGZvdW5k UG9zaXRpb25DU1NQcm9wZXJ0eSkgeworICAgICAgICBpZiAoaXNGb3J3YXJkU2xhc2hPcGVyYXRv cih2YWwpICYmIGZvdW5kUG9zaXRpb25DU1NQcm9wZXJ0eSkgewogICAgICAgICAgICAgc2l6ZUNT U1Byb3BlcnR5RXhwZWN0ZWQgPSB0cnVlOwogICAgICAgICAgICAgbV92YWx1ZUxpc3QtPm5leHQo KTsKICAgICAgICAgfQpAQCAtNTA4MCw3ICs1MDg1LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNl Rm9udChib29sIGltcG9ydGFudCkKICAgICBpZiAoIXZhbHVlKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBpZiAodmFsdWUtPnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6Ok9wZXJhdG9yICYm IHZhbHVlLT5pVmFsdWUgPT0gJy8nKSB7CisgICAgaWYgKGlzRm9yd2FyZFNsYXNoT3BlcmF0b3Io dmFsdWUpKSB7CiAgICAgICAgIC8vIFRoZSBsaW5lLWhlaWdodCBwcm9wZXJ0eS4KICAgICAgICAg dmFsdWUgPSBtX3ZhbHVlTGlzdC0+bmV4dCgpOwogICAgICAgICBpZiAoIXZhbHVlKQpAQCAtNjM3 MSw3ICs2Mzc2LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQm9yZGVySW1hZ2UoQ1NTUHJvcGVy dHlJRCBwcm9wSWQsIFJlZlB0cjxDU1NWYWx1ZT4mIHJlc3VsdCwKICAgICB3aGlsZSAoQ1NTUGFy c2VyVmFsdWUqIHZhbCA9IG1fdmFsdWVMaXN0LT5jdXJyZW50KCkpIHsKICAgICAgICAgY29udGV4 dC5zZXRDYW5BZHZhbmNlKGZhbHNlKTsKIAotICAgICAgICBpZiAoIWNvbnRleHQuY2FuQWR2YW5j ZSgpICYmIGNvbnRleHQuYWxsb3dTbGFzaCgpICYmIHZhbC0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1 ZTo6T3BlcmF0b3IgJiYgdmFsLT5pVmFsdWUgPT0gJy8nKQorICAgICAgICBpZiAoIWNvbnRleHQu Y2FuQWR2YW5jZSgpICYmIGNvbnRleHQuYWxsb3dTbGFzaCgpICYmIGlzRm9yd2FyZFNsYXNoT3Bl cmF0b3IodmFsKSkKICAgICAgICAgICAgIGNvbnRleHQuY29tbWl0U2xhc2goKTsKIAogICAgICAg ICBpZiAoIWNvbnRleHQuY2FuQWR2YW5jZSgpICYmIGNvbnRleHQuYWxsb3dJbWFnZSgpKSB7CkBA IC02Nzg3LDcgKzY3OTIsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VBc3BlY3RSYXRpbyhib29s IGltcG9ydGFudCkKICAgICBDU1NQYXJzZXJWYWx1ZSogb3AgPSBtX3ZhbHVlTGlzdC0+dmFsdWVB dCgxKTsKICAgICBDU1NQYXJzZXJWYWx1ZSogcnZhbHVlID0gbV92YWx1ZUxpc3QtPnZhbHVlQXQo Mik7CiAKLSAgICBpZiAob3AtPnVuaXQgIT0gQ1NTUGFyc2VyVmFsdWU6Ok9wZXJhdG9yIHx8IG9w LT5pVmFsdWUgIT0gJy8nKQorICAgIGlmICghaXNGb3J3YXJkU2xhc2hPcGVyYXRvcihvcCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghdmFsaWRVbml0KGx2YWx1ZSwgRk51bWJl ciB8IEZOb25OZWcpIHx8ICF2YWxpZFVuaXQocnZhbHVlLCBGTnVtYmVyIHwgRk5vbk5lZykpCg==