41297 2010-06-28 13:01:59 -0700 [V8] Catch toString() exceptions in all DB-related code in V8 bindings 2010-06-29 01:00:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi abarth eric webkit.review.bot oldest_to_newest 243836 0 dumi 2010-06-28 13:01:59 -0700 V8Binding::v8NonStringValueToWebCoreString() suppresses the exceptions thrown by ToString() and returns an empty String. It shouldn't do that. 244117 1 59991 dumi 2010-06-28 23:26:46 -0700 Created attachment 59991 patch 244128 2 59991 abarth 2010-06-28 23:50:42 -0700 Comment on attachment 59991 patch Looks good. WebCore/bindings/v8/custom/V8BindingMacros.h:35 + var = value; \ It's usually a good idea to put parenthesis around (value). Otherwise you might get strange order-of-operations issues. WebCore/bindings/v8/custom/V8BindingMacros.h:44 + v8::Handle<v8::String> v8String = value->ToString(); \ It's usually a good idea to put parenthesis around (value). Otherwise you might get strange order-of-operations issues. 244138 3 dumi 2010-06-29 00:31:08 -0700 (In reply to comment #2) > (From update of attachment 59991 [details]) > Looks good. > > WebCore/bindings/v8/custom/V8BindingMacros.h:35 > + var = value; \ > It's usually a good idea to put parenthesis around (value). Otherwise you might get strange order-of-operations issues. > > WebCore/bindings/v8/custom/V8BindingMacros.h:44 > + v8::Handle<v8::String> v8String = value->ToString(); \ > It's usually a good idea to put parenthesis around (value). Otherwise you might get strange order-of-operations issues. good point! fixed. 244141 4 dumi 2010-06-29 00:40:06 -0700 Landed: r62094. 244147 5 webkit.review.bot 2010-06-29 01:00:21 -0700 http://trac.webkit.org/changeset/62094 might have broken Qt Windows 32-bit Release The following changes are on the blame list: http://trac.webkit.org/changeset/62093 http://trac.webkit.org/changeset/62094 http://trac.webkit.org/changeset/62095 59991 2010-06-28 23:26:46 -0700 2010-06-28 23:50:42 -0700 patch patch text/plain 11699 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjA4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0yNDMsNiArMjQzLDI4IEBACiAKIDIwMTAtMDYtMjggIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1p QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDYXRjaCB0b1N0cmluZygpIGV4Y2VwdGlvbnMgaW4gYWxsIERCLXJlbGF0ZWQgY29k ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjk3 CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhCaW5kaW5nTWFjcm9zLmg6CisgICAg ICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlY4RE9NV2luZG93OjpvcGVuRGF0YWJhc2VDYWxsYmFjayk6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YWJhc2VDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VjhEYXRhYmFzZTo6Y2hhbmdlVmVyc2lvbkNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhEYXRhYmFzZVN5bmNDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VjhEYXRhYmFzZVN5bmM6OmNoYW5nZVZlcnNpb25DYWxsYmFjayk6CisgICAgICAgICogYmluZGlu Z3MvdjgvY3VzdG9tL1Y4U1FMVHJhbnNhY3Rpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VjhTUUxUcmFuc2FjdGlvbjo6ZXhlY3V0ZVNxbENhbGxiYWNrKToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9jdXN0b20vVjhTUUxUcmFuc2FjdGlvblN5bmNDdXN0b20uY3BwOgorICAgICAgICAo V2ViQ29yZTo6VjhTUUxUcmFuc2FjdGlvblN5bmM6OmV4ZWN1dGVTcWxDYWxsYmFjayk6CisgICAg ICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4V29ya2VyQ29udGV4dEN1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOFdvcmtlckNvbnRleHQ6Om9wZW5EYXRhYmFzZUNhbGxiYWNrKToKKyAg ICAgICAgKFdlYkNvcmU6OlY4V29ya2VyQ29udGV4dDo6b3BlbkRhdGFiYXNlU3luY0NhbGxiYWNr KToKKworMjAxMC0wNi0yOCAgRHVtaXRydSBEYW5pbGl1YyAgPGR1bWlAY2hyb21pdW0ub3JnPgor CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgogCiAgICAgICAgIEZpeCBhIHJhY2Ug Y29uZGl0aW9uIHRoYXQgY2FuIGhhcHBlbiB3aGVuIHVzaW5nIERCcyBpbiB3b3JrZXJzLgpJbmRl eDogV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhCaW5kaW5nTWFjcm9zLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhCaW5kaW5nTWFjcm9zLmgJKHJldmlz aW9uIDYyMDg2KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhCaW5kaW5nTWFjcm9z LmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDExICsyOCwyMSBAQAogICogT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAq LwogCi0jZGVmaW5lIEVYQ0VQVElPTl9CTE9DSyh0eXBlLCB2YXIsIHZhbHVlKSAgICAgICAgIFwK LSAgICB0eXBlIHZhcjsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAg IHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAg IHY4OjpUcnlDYXRjaCBibG9jazsgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgdmFy ID0gdmFsdWU7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBpZiAoYmxv Y2suSGFzQ2F1Z2h0KCkpICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICByZXR1cm4g dGhyb3dFcnJvcihibG9jay5FeGNlcHRpb24oKSk7IFwKKyNkZWZpbmUgRVhDRVBUSU9OX0JMT0NL KHR5cGUsIHZhciwgdmFsdWUpIFwKKyAgICB0eXBlIHZhcjsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKKyAgICB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAg ICAgICAgdjg6OlRyeUNhdGNoIGJsb2NrOyAgICAgICAgICAgICAgIFwKKyAgICAgICAgdmFyID0g dmFsdWU7ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgaWYgKGJsb2NrLkhhc0NhdWdo dCgpKSAgICAgICAgICAgIFwKKyAgICAgICAgICAgIHJldHVybiBibG9jay5SZVRocm93KCk7ICAg ICAgIFwKKyAgICB9CisKKyNkZWZpbmUgVE9fV0VCQ09SRV9TVFJJTkdfRVhDRVBUSU9OX0JMT0NL KHZhciwgdmFsdWUpICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICBTdHJpbmcgdmFyOyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK KyAgICB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgdjg6OlRyeUNhdGNoIGJsb2NrOyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgdjg6Okhh bmRsZTx2ODo6U3RyaW5nPiB2OFN0cmluZyA9IHZhbHVlLT5Ub1N0cmluZygpOyAgICAgICAgICAg ICAgIFwKKyAgICAgICAgaWYgKGJsb2NrLkhhc0NhdWdodCgpKSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIHJldHVybiBibG9jay5SZVRo cm93KCk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAg dmFyID0gdjhTdHJpbmdUb1dlYkNvcmVTdHJpbmc8U3RyaW5nPih2OFN0cmluZywgRG9Ob3RFeHRl cm5hbGl6ZSk7IFwKICAgICB9CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERP TVdpbmRvd0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhET01XaW5kb3dDdXN0b20uY3BwCShyZXZpc2lvbiA2MjA4NikKKysrIFdlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAt Nzk1LDkgKzc5NSw5IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERPTVdpbmRvdzo6b3BlbkQK ICAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDQpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKFNZ TlRBWF9FUlIpOwogCi0gICAgRVhDRVBUSU9OX0JMT0NLKFN0cmluZywgbmFtZSwgdG9XZWJDb3Jl U3RyaW5nKGFyZ3NbMF0pKTsKLSAgICBFWENFUFRJT05fQkxPQ0soU3RyaW5nLCB2ZXJzaW9uLCB0 b1dlYkNvcmVTdHJpbmcoYXJnc1sxXSkpOwotICAgIEVYQ0VQVElPTl9CTE9DSyhTdHJpbmcsIGRp c3BsYXlOYW1lLCB0b1dlYkNvcmVTdHJpbmcoYXJnc1syXSkpOworICAgIFRPX1dFQkNPUkVfU1RS SU5HX0VYQ0VQVElPTl9CTE9DSyhuYW1lLCBhcmdzWzBdKTsKKyAgICBUT19XRUJDT1JFX1NUUklO R19FWENFUFRJT05fQkxPQ0sodmVyc2lvbiwgYXJnc1sxXSk7CisgICAgVE9fV0VCQ09SRV9TVFJJ TkdfRVhDRVBUSU9OX0JMT0NLKGRpc3BsYXlOYW1lLCBhcmdzWzJdKTsKICAgICBFWENFUFRJT05f QkxPQ0sodW5zaWduZWQgbG9uZywgZXN0aW1hdGVkU2l6ZSwgYXJnc1szXS0+VWludDMyVmFsdWUo KSk7CiAKICAgICBET01XaW5kb3cqIGltcCA9IFY4RE9NV2luZG93Ojp0b05hdGl2ZShhcmdzLkhv bGRlcigpKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YWJhc2VDdXN0 b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YWJh c2VDdXN0b20uY3BwCShyZXZpc2lvbiA2MjA4NikKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4RGF0YWJhc2VDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw4ICs1MCw4IEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERhdGFiYXNlOjpjaGFuZ2UKICAgICBpZiAoYXJncy5M ZW5ndGgoKSA8IDIpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKFNZTlRBWF9FUlIpOwogCi0g ICAgRVhDRVBUSU9OX0JMT0NLKFN0cmluZywgb2xkVmVyc2lvbiwgdG9XZWJDb3JlU3RyaW5nKGFy Z3NbMF0pKTsKLSAgICBFWENFUFRJT05fQkxPQ0soU3RyaW5nLCBuZXdWZXJzaW9uLCB0b1dlYkNv cmVTdHJpbmcoYXJnc1sxXSkpOworICAgIFRPX1dFQkNPUkVfU1RSSU5HX0VYQ0VQVElPTl9CTE9D SyhvbGRWZXJzaW9uLCBhcmdzWzBdKTsKKyAgICBUT19XRUJDT1JFX1NUUklOR19FWENFUFRJT05f QkxPQ0sobmV3VmVyc2lvbiwgYXJnc1sxXSk7CiAKICAgICBEYXRhYmFzZSogZGF0YWJhc2UgPSBW OERhdGFiYXNlOjp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKIApJbmRleDogV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhEYXRhYmFzZVN5bmNDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YWJhc2VTeW5jQ3VzdG9tLmNwcAkocmV2aXNp b24gNjIwODYpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFiYXNlU3luY0N1 c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDggKzQ4LDggQEAgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IFY4RGF0YWJhc2VTeW5jOjpjaAogICAgIGlmIChhcmdzLkxlbmd0aCgpIDwgMikKICAg ICAgICAgcmV0dXJuIHRocm93RXJyb3IoU1lOVEFYX0VSUik7CiAKLSAgICBFWENFUFRJT05fQkxP Q0soU3RyaW5nLCBvbGRWZXJzaW9uLCB0b1dlYkNvcmVTdHJpbmcoYXJnc1swXSkpOwotICAgIEVY Q0VQVElPTl9CTE9DSyhTdHJpbmcsIG5ld1ZlcnNpb24sIHRvV2ViQ29yZVN0cmluZyhhcmdzWzFd KSk7CisgICAgVE9fV0VCQ09SRV9TVFJJTkdfRVhDRVBUSU9OX0JMT0NLKG9sZFZlcnNpb24sIGFy Z3NbMF0pOworICAgIFRPX1dFQkNPUkVfU1RSSU5HX0VYQ0VQVElPTl9CTE9DSyhuZXdWZXJzaW9u LCBhcmdzWzFdKTsKIAogICAgIERhdGFiYXNlU3luYyogZGF0YWJhc2UgPSBWOERhdGFiYXNlU3lu Yzo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4U1FMVHJhbnNhY3Rpb25DdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv YmluZGluZ3MvdjgvY3VzdG9tL1Y4U1FMVHJhbnNhY3Rpb25DdXN0b20uY3BwCShyZXZpc2lvbiA2 MjA4NikKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1FMVHJhbnNhY3Rpb25DdXN0 b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBWOFNRTFRyYW5zYWN0aW9uOjoKICAgICBpZiAoYXJncy5MZW5ndGgoKSA9PSAwKQogICAg ICAgICByZXR1cm4gdGhyb3dFcnJvcihTWU5UQVhfRVJSKTsKIAotICAgIEVYQ0VQVElPTl9CTE9D SyhTdHJpbmcsIHN0YXRlbWVudCwgdG9XZWJDb3JlU3RyaW5nKGFyZ3NbMF0pKTsKKyAgICBUT19X RUJDT1JFX1NUUklOR19FWENFUFRJT05fQkxPQ0soc3RhdGVtZW50LCBhcmdzWzBdKTsKIAogICAg IFZlY3RvcjxTUUxWYWx1ZT4gc3FsVmFsdWVzOwogCkBAIC04MSw3ICs4MSw3IEBAIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBWOFNRTFRyYW5zYWN0aW9uOjoKICAgICAgICAgICAgICAgICBFWENFUFRJ T05fQkxPQ0soZG91YmxlLCBzcWxWYWx1ZSwgdmFsdWUtPk51bWJlclZhbHVlKCkpOwogICAgICAg ICAgICAgICAgIHNxbFZhbHVlcy5hcHBlbmQoU1FMVmFsdWUoc3FsVmFsdWUpKTsKICAgICAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgRVhDRVBUSU9OX0JMT0NLKFN0cmluZywgc3Fs VmFsdWUsIHRvV2ViQ29yZVN0cmluZyh2YWx1ZSkpOworICAgICAgICAgICAgICAgIFRPX1dFQkNP UkVfU1RSSU5HX0VYQ0VQVElPTl9CTE9DSyhzcWxWYWx1ZSwgdmFsdWUpOwogICAgICAgICAgICAg ICAgIHNxbFZhbHVlcy5hcHBlbmQoU1FMVmFsdWUoc3FsVmFsdWUpKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhTUUxUcmFuc2Fj dGlvblN5bmNDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4U1FMVHJhbnNhY3Rpb25TeW5jQ3VzdG9tLmNwcAkocmV2aXNpb24gNjIwODYpCisrKyBX ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFNRTFRyYW5zYWN0aW9uU3luY0N1c3RvbS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUzLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4 U1FMVHJhbnNhY3Rpb25TeQogICAgIGlmICghYXJncy5MZW5ndGgoKSkKICAgICAgICAgcmV0dXJu IHRocm93RXJyb3IoU1lOVEFYX0VSUik7CiAKLSAgICBFWENFUFRJT05fQkxPQ0soU3RyaW5nLCBz dGF0ZW1lbnQsIHRvV2ViQ29yZVN0cmluZyhhcmdzWzBdKSk7CisgICAgVE9fV0VCQ09SRV9TVFJJ TkdfRVhDRVBUSU9OX0JMT0NLKHN0YXRlbWVudCwgYXJnc1swXSk7CiAKICAgICBWZWN0b3I8U1FM VmFsdWU+IHNxbFZhbHVlczsKIApAQCAtODAsNyArODAsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhTUUxUcmFuc2FjdGlvblN5CiAgICAgICAgICAgICAgICAgRVhDRVBUSU9OX0JMT0NLKGRv dWJsZSwgc3FsVmFsdWUsIHZhbHVlLT5OdW1iZXJWYWx1ZSgpKTsKICAgICAgICAgICAgICAgICBz cWxWYWx1ZXMuYXBwZW5kKFNRTFZhbHVlKHNxbFZhbHVlKSk7CiAgICAgICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgICAgIEVYQ0VQVElPTl9CTE9DSyhTdHJpbmcsIHNxbFZhbHVlLCB0b1dl YkNvcmVTdHJpbmcodmFsdWUpKTsKKyAgICAgICAgICAgICAgICBUT19XRUJDT1JFX1NUUklOR19F WENFUFRJT05fQkxPQ0soc3FsVmFsdWUsIHZhbHVlKTsKICAgICAgICAgICAgICAgICBzcWxWYWx1 ZXMuYXBwZW5kKFNRTFZhbHVlKHNxbFZhbHVlKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V29ya2VyQ29udGV4dEN1c3RvbS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXb3JrZXJDb250 ZXh0Q3VzdG9tLmNwcAkocmV2aXNpb24gNjIwODYpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOFdvcmtlckNvbnRleHRDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsOSAr MTUwLDkgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V29ya2VyQ29udGV4dDo6bwogICAgIGlm IChhcmdzLkxlbmd0aCgpIDwgNCkKICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoU1lOVEFYX0VS Uik7CiAKLSAgICBFWENFUFRJT05fQkxPQ0soU3RyaW5nLCBuYW1lLCB0b1dlYkNvcmVTdHJpbmco YXJnc1swXSkpOwotICAgIEVYQ0VQVElPTl9CTE9DSyhTdHJpbmcsIHZlcnNpb24sIHRvV2ViQ29y ZVN0cmluZyhhcmdzWzFdKSk7Ci0gICAgRVhDRVBUSU9OX0JMT0NLKFN0cmluZywgZGlzcGxheU5h bWUsIHRvV2ViQ29yZVN0cmluZyhhcmdzWzJdKSk7CisgICAgVE9fV0VCQ09SRV9TVFJJTkdfRVhD RVBUSU9OX0JMT0NLKG5hbWUsIGFyZ3NbMF0pOworICAgIFRPX1dFQkNPUkVfU1RSSU5HX0VYQ0VQ VElPTl9CTE9DSyh2ZXJzaW9uLCBhcmdzWzFdKTsKKyAgICBUT19XRUJDT1JFX1NUUklOR19FWENF UFRJT05fQkxPQ0soZGlzcGxheU5hbWUsIGFyZ3NbMl0pOwogICAgIEVYQ0VQVElPTl9CTE9DSyh1 bnNpZ25lZCBsb25nLCBlc3RpbWF0ZWRTaXplLCBhcmdzWzNdLT5VaW50MzJWYWx1ZSgpKTsKIAog ICAgIFdvcmtlckNvbnRleHQqIHdvcmtlckNvbnRleHQgPSBWOFdvcmtlckNvbnRleHQ6OnRvTmF0 aXZlKGFyZ3MuSG9sZGVyKCkpOwpAQCAtMTc4LDkgKzE3OCw5IEBAIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBWOFdvcmtlckNvbnRleHQ6Om8KICAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDQpCiAgICAg ICAgIHJldHVybiB0aHJvd0Vycm9yKFNZTlRBWF9FUlIpOwogCi0gICAgRVhDRVBUSU9OX0JMT0NL KFN0cmluZywgbmFtZSwgdG9XZWJDb3JlU3RyaW5nKGFyZ3NbMF0pKTsKLSAgICBFWENFUFRJT05f QkxPQ0soU3RyaW5nLCB2ZXJzaW9uLCB0b1dlYkNvcmVTdHJpbmcoYXJnc1sxXSkpOwotICAgIEVY Q0VQVElPTl9CTE9DSyhTdHJpbmcsIGRpc3BsYXlOYW1lLCB0b1dlYkNvcmVTdHJpbmcoYXJnc1sy XSkpOworICAgIFRPX1dFQkNPUkVfU1RSSU5HX0VYQ0VQVElPTl9CTE9DSyhuYW1lLCBhcmdzWzBd KTsKKyAgICBUT19XRUJDT1JFX1NUUklOR19FWENFUFRJT05fQkxPQ0sodmVyc2lvbiwgYXJnc1sx XSk7CisgICAgVE9fV0VCQ09SRV9TVFJJTkdfRVhDRVBUSU9OX0JMT0NLKGRpc3BsYXlOYW1lLCBh cmdzWzJdKTsKICAgICBFWENFUFRJT05fQkxPQ0sodW5zaWduZWQgbG9uZywgZXN0aW1hdGVkU2l6 ZSwgYXJnc1szXS0+VWludDMyVmFsdWUoKSk7CiAKICAgICBXb3JrZXJDb250ZXh0KiB3b3JrZXJD b250ZXh0ID0gVjhXb3JrZXJDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDYyMDg2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDYtMjggIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1p QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmUgYSBDaHJvbWl1bS1zcGVjaWZpYyBleHBlY3RhdGlvbnMgZmlsZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjk3CisKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9zdG9yYWdlL3NxbC1lcnJvci1jb2Rlcy1leHBlY3Rl ZC50eHQ6CisgICAgICAgICogc3RvcmFnZS9zcWwtZXJyb3ItY29kZXMuanM6CisgICAgICAgICh0 ZXN0QmluZFBhcmFtZXRlck9mV3JvbmdUeXBlKToKKwogMjAxMC0wNi0yOCAgRGF2aWQgTGV2aW4g IDxsZXZpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZICh0ZXN0 IGV4cGVjdGF0aW9ucyB1cGRhdGUgZm9yIGNocm9taXVtKS4KSW5kZXg6IExheW91dFRlc3RzL3Bs YXRmb3JtL2Nocm9taXVtL3N0b3JhZ2Uvc3FsLWVycm9yLWNvZGVzLWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9zdG9yYWdlL3NxbC1lcnJv ci1jb2Rlcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDYyMDg2KQorKysgTGF5b3V0VGVzdHMvcGxh dGZvcm0vY2hyb21pdW0vc3RvcmFnZS9zcWwtZXJyb3ItY29kZXMtZXhwZWN0ZWQudHh0CSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDEwICsxLDExIEBACiBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzc6IFVu Y2F1Z2h0IEV4Y2VwdGlvbiB0aHJvd24gaW4gdHJhbnNhY3Rpb24gY2FsbGJhY2suCitDT05TT0xF IE1FU1NBR0U6IGxpbmUgNjk6IFVuY2F1Z2h0IENhbm5vdCBjYWxsIHRvU3RyaW5nKCkgb24gdGhp cyBvYmplY3QuCiBUaGlzIHRlc3QgdGVzdHMgdGhlIGVycm9yIGNvZGVzIHJlcG9ydGVkIGluIGV4 Y2VwdGlvbmFsIHNpdHVhdGlvbnMuCiBQQVNTOiBleHBlY3RlZCBhbmQgZ290IGVycm9yIGNvZGUg VU5LTk9XTl9FUlIKIFBBU1M6IGV4cGVjdGVkIGFuZCBnb3QgZXJyb3IgY29kZSBVTktOT1dOX0VS UgogUEFTUzogZXhwZWN0ZWQgYW5kIGdvdCBlcnJvciBjb2RlIFNZTlRBWF9FUlIKIFBBU1M6IGV4 cGVjdGVkIGFuZCBnb3QgZXJyb3IgY29kZSBTWU5UQVhfRVJSCi1UaGUgdHJhbnNhY3Rpb24gaW4g dGVzdEJpbmRQYXJhbWV0ZXJPZldyb25nVHlwZSgpIHdhcyBzdWNjZXNzZnVsLgorUEFTUzogZXhw ZWN0ZWQgYW5kIGdvdCBlcnJvciBjb2RlIFVOS05PV05fRVJSCiBQQVNTOiBleHBlY3RlZCBhbmQg Z290IGVycm9yIGNvZGUgUVVPVEFfRVJSCiBQQVNTOiBleHBlY3RlZCBhbmQgZ290IGVycm9yIGNv ZGUgVkVSU0lPTl9FUlIKIApJbmRleDogTGF5b3V0VGVzdHMvc3RvcmFnZS9zcWwtZXJyb3ItY29k ZXMuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3RvcmFnZS9zcWwtZXJyb3ItY29kZXMu anMJKHJldmlzaW9uIDYyMDg2KQorKysgTGF5b3V0VGVzdHMvc3RvcmFnZS9zcWwtZXJyb3ItY29k ZXMuanMJKHdvcmtpbmcgY29weSkKQEAgLTY0LDE3ICs2NCwxMCBAQCBmdW5jdGlvbiB0ZXN0Qmlu ZFBhcmFtZXRlck9mV3JvbmdUeXBlKGRiCiAgICAgdmFyIGJhZFN0cmluZyA9IHsgfTsKICAgICBi YWRTdHJpbmcudG9TdHJpbmcgPSBmdW5jdGlvbigpIHsgdGhyb3cgIkNhbm5vdCBjYWxsIHRvU3Ry aW5nKCkgb24gdGhpcyBvYmplY3QuIiB9OwogCi0gICAgLy8gSlNDIHdpbGwgdGhyb3cgYW4gZXhj ZXB0aW9uIHdoZW4gY2FsbGluZyBiYWRTdHJpbmcudG9TdHJpbmcoKS4gVjggd2lsbCBjYXRjaCBp dC4KLSAgICAvLyBTbyB3ZSBydW4gdGhpcyB0cmFuc2FjdGlvbiB1c2luZyBhIGN1c3RvbSBzdWNj ZXNzIGNhbGxiYWNrLgotICAgIGRiLnRyYW5zYWN0aW9uKGZ1bmN0aW9uKHR4KSB7CisgICAgdGVz dFRyYW5zYWN0aW9uKGRiLCBmdW5jdGlvbih0eCkgewogICAgICAgICB0eC5leGVjdXRlU3FsKCJD UkVBVEUgVEFCTEUgSUYgTk9UIEVYSVNUUyBCYWRCaW5kVHlwZVRlc3QgKEZvbyBURVhUKSIpOwog ICAgICAgICB0eC5leGVjdXRlU3FsKCJJTlNFUlQgSU5UTyBCYWRCaW5kVHlwZVRlc3QgVkFMVUVT ICg/KSIsIFtiYWRTdHJpbmddKTsKLSAgICB9LCBmdW5jdGlvbihlcnJvcikgewotICAgICAgICB0 cmFuc2FjdGlvbkVycm9yQ2FsbGJhY2soZXJyb3IsICJVTktOT1dOX0VSUiIpOwotICAgIH0sIGZ1 bmN0aW9uKCkgewotICAgICAgICBsb2coIlRoZSB0cmFuc2FjdGlvbiBpbiB0ZXN0QmluZFBhcmFt ZXRlck9mV3JvbmdUeXBlKCkgd2FzIHN1Y2Nlc3NmdWwuIik7Ci0gICAgICAgIHRlc3RzUnVuKys7 Ci0gICAgfSk7CisgICAgfSwgIlVOS05PV05fRVJSIik7CiB9CiAKIGZ1bmN0aW9uIHRlc3RRdW90 YUV4Y2VlZGVkKGRiKQo=