121695 2013-09-20 10:48:29 -0700 REGRESSION (r156140): Srcset tests are frequently crashing 2013-09-20 11:38:09 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED MakingBotsRed, Regression P2 Normal --- 121609 1 ap webkit-unassigned benjamin commit-queue dino esprehn+autocc romain.perier yoav oldest_to_newest 931459 0 ap 2013-09-20 10:48:29 -0700 I think that URL bytes need to be copied now. 931462 1 romain.perier 2013-09-20 10:55:58 -0700 I confirm the issue, I have a patch locally, the URL assignment Must be copied using String::substring. It solves The problem. Could you assign me this bug please ? Thanks in advance 931464 2 romain.perier 2013-09-20 10:58:43 -0700 It should be fixed this week end, or feel free To fix it yourself if this is really important :) 931469 3 212196 ap 2013-09-20 11:08:18 -0700 Created attachment 212196 proposed fix 931471 4 ap 2013-09-20 11:13:06 -0700 Yes, it's fairly urgent. I want bots to be very very green. Also made a bunch of style fixes to make this code better align with WebKit style. 931484 5 ap 2013-09-20 11:30:53 -0700 Committed <http://trac.webkit.org/r156183>. 931489 6 212196 darin 2013-09-20 11:37:37 -0700 Comment on attachment 212196 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=212196&action=review > Source/WebCore/html/parser/HTMLParserIdioms.cpp:393 > + image.imageURL = String(srcsetAttribute.characters() + imageURLStart, imageURLEnd - imageURLStart); Might be clearer to use the substring function to do this. Even possibly leaves the door open for future optimization where we share the character backing store between the original string and the substring. 931491 7 212196 darin 2013-09-20 11:38:09 -0700 Comment on attachment 212196 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=212196&action=review > Source/WebCore/html/parser/HTMLParserIdioms.cpp:384 > + imageScaleFactor = charactersToFloat(srcsetAttribute.characters() + imageScaleStart, scaleFactorLengthWithoutUnit, &validScaleFactor); A shame that this forces an 8-bit string to be converted to 16-bit. Not new to this patch, but unpleasant. 212196 2013-09-20 11:08:18 -0700 2013-09-20 11:38:09 -0700 proposed fix srcsetCrashes.txt text/plain 8413 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjE4MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA5LTIwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxNTYx NDApOiBTcmNzZXQgdGVzdHMgYXJlIGZyZXF1ZW50bHkgY3Jhc2hpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTY5NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldHVybmluZyBhIHN0cmluZyBjcmVh dGVkIHdpdGhvdXQgY29weWluZyBieXRlcyBpcyBub3Qgc2FmZS4gSXQgdXNlZCB0byBiZSBPSwor ICAgICAgICBiZWNhdXNlIGEgbmV3IHN0cmluZyB3YXMgaW1tZWRpYXRlbHkgY3JlYXRlZCBieSBk ZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoKS4KKyAgICAgICAgQnV0IGV2ZW4gdGhhdCB3YXMgbm90 IGdyZWF0LCBiZWNhdXNlIGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcygpIGNvdWxkIHBvdGVudGlh bGx5CisgICAgICAgIHJldHVybiB0aGUgc2FtZSBzdHJpbmcsIG5vdCBhIGRlZXAgY29weSwgaWYg d2UgZGVjaWRlZCB0byBvcHRpbWl6ZSBpdCBsaWtlIHRoYXQuCisKKyAgICAgICAgQWxzbyBtYWRl IGEgbnVtYmVyIG9mIGRyaXZlLWJ5IHN0eWxlIGZpeGVzLgorICAgICAgICAtIEl0J3MgVVJMLCBu b3QgVXJsLgorICAgICAgICAtIEl0J3Mgc3Jjc2V0LCBub3Qgc3JjU2V0LgorICAgICAgICAtICBX ZSBkb24ndCBhZGQgIi4wIiBpbiBmbG9hdGluZyBwb2ludCB2YWx1ZSBpbml0aWFsaXplcnMuIEl0 J3MgcGFydGljdWxhcmx5IG1pc2xlYWRpbmcKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBhIGZsb2F0 IHdpdGggMS4wLCB3aGljaCBpcyBhIGRvdWJsZSB2YWx1ZS4KKyAgICAgICAgLSBSZW5hbWVkIHNy Y1NldExlbmd0aCB0byBzcmNzZXRBdHRyaWJ1dGVMZW5ndGggdG8gbWF0Y2ggc3Jjc2V0QXR0cmli dXRlIHZhcmlhYmxlCisgICAgICAgIHdob3NlIGxlbmd0aCBpdCBjYWNoZXMuCisKKyAgICAgICAg KiBodG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBh cnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKToKKwogMjAxMy0wOS0yMCAgUGF0cmlj ayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggdGhlIGJ1aWxk IGFmdGVyIHIxNTYxNDQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJz ZXJJZGlvbXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxQYXJzZXJJZGlvbXMuY3BwCShyZXZpc2lvbiAxNTYxNjkpCisrKyBTb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIxLDY1 ICszMjEsNjcgQEAgc3RhdGljIGlubGluZSBib29sIGlzSFRNTFNwYWNlT3JDb21tYShVQwogCiAv LyBTZWUgdGhlIHNwZWNpZmljYXRpb25zIGZvciBtb3JlIGRldGFpbHMgYWJvdXQgdGhlIGFsZ29y aXRobSB0byBmb2xsb3cuCiAvLyBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEzL1dELWh0bWwtc3Jj c2V0LTIwMTMwMjI4LyNwcm9jZXNzaW5nLXRoZS1pbWFnZS1jYW5kaWRhdGVzLgotc3RhdGljIHZv aWQgcGFyc2VJbWFnZXNXaXRoU2NhbGVGcm9tU3JjU2V0QXR0cmlidXRlKGNvbnN0IFN0cmluZyYg c3JjU2V0QXR0cmlidXRlLCBJbWFnZUNhbmRpZGF0ZXMmIGltYWdlQ2FuZGlkYXRlcykKK3N0YXRp YyB2b2lkIHBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZShjb25zdCBTdHJp bmcmIHNyY3NldEF0dHJpYnV0ZSwgSW1hZ2VDYW5kaWRhdGVzJiBpbWFnZUNhbmRpZGF0ZXMpCiB7 CisgICAgQVNTRVJUKGltYWdlQ2FuZGlkYXRlcy5pc0VtcHR5KCkpOworCiAgICAgc2l6ZV90IGlt YWdlQ2FuZGlkYXRlU3RhcnQgPSAwOwotICAgIHVuc2lnbmVkIHNyY1NldExlbmd0aCA9IHNyY1Nl dEF0dHJpYnV0ZS5sZW5ndGgoKTsKKyAgICB1bnNpZ25lZCBzcmNzZXRBdHRyaWJ1dGVMZW5ndGgg PSBzcmNzZXRBdHRyaWJ1dGUubGVuZ3RoKCk7CiAKLSAgICB3aGlsZSAoaW1hZ2VDYW5kaWRhdGVT dGFydCA8IHNyY1NldExlbmd0aCkgewotICAgICAgICBmbG9hdCBpbWdTY2FsZUZhY3RvciA9IDEu MDsKKyAgICB3aGlsZSAoaW1hZ2VDYW5kaWRhdGVTdGFydCA8IHNyY3NldEF0dHJpYnV0ZUxlbmd0 aCkgeworICAgICAgICBmbG9hdCBpbWFnZVNjYWxlRmFjdG9yID0gMTsKICAgICAgICAgc2l6ZV90 IHNlcGFyYXRvcjsKIAogICAgICAgICAvLyA0LiBTcGxpdHRpbmcgbG9vcDogU2tpcCB3aGl0ZXNw YWNlLgotICAgICAgICBzaXplX3QgaW1hZ2VVcmxTdGFydCA9IHNyY1NldEF0dHJpYnV0ZS5maW5k KGlzTm90SFRNTFNwYWNlLCBpbWFnZUNhbmRpZGF0ZVN0YXJ0KTsKLSAgICAgICAgaWYgKGltYWdl VXJsU3RhcnQgPT0gbm90Rm91bmQpCisgICAgICAgIHNpemVfdCBpbWFnZVVSTFN0YXJ0ID0gc3Jj c2V0QXR0cmlidXRlLmZpbmQoaXNOb3RIVE1MU3BhY2UsIGltYWdlQ2FuZGlkYXRlU3RhcnQpOwor ICAgICAgICBpZiAoaW1hZ2VVUkxTdGFydCA9PSBub3RGb3VuZCkKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAvLyBJZiBUaGUgY3VycmVudCBjYW5kaWRhdGUgaXMgZWl0aGVyIHRvdGFsbHkg ZW1wdHkgb3Igb25seSBjb250YWlucyBzcGFjZSwgc2tpcHBpbmcuCi0gICAgICAgIGlmIChzcmNT ZXRBdHRyaWJ1dGVbaW1hZ2VVcmxTdGFydF0gPT0gJywnKSB7Ci0gICAgICAgICAgICBpbWFnZUNh bmRpZGF0ZVN0YXJ0ID0gaW1hZ2VVcmxTdGFydCArIDE7CisgICAgICAgIGlmIChzcmNzZXRBdHRy aWJ1dGVbaW1hZ2VVUkxTdGFydF0gPT0gJywnKSB7CisgICAgICAgICAgICBpbWFnZUNhbmRpZGF0 ZVN0YXJ0ID0gaW1hZ2VVUkxTdGFydCArIDE7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQogICAgICAgICAvLyA1LiBDb2xsZWN0IGEgc2VxdWVuY2Ugb2YgY2hhcmFjdGVycyB0aGF0 IGFyZSBub3Qgc3BhY2UgY2hhcmFjdGVycywgYW5kIGxldCB0aGF0IGJlIHVybC4KLSAgICAgICAg c2l6ZV90IGltYWdlVXJsRW5kID0gc3JjU2V0QXR0cmlidXRlLmZpbmQoaXNIVE1MU3BhY2UsIGlt YWdlVXJsU3RhcnQgKyAxKTsKLSAgICAgICAgaWYgKGltYWdlVXJsRW5kID09IG5vdEZvdW5kKSB7 Ci0gICAgICAgICAgICBpbWFnZVVybEVuZCA9IHNyY1NldExlbmd0aDsKLSAgICAgICAgICAgIHNl cGFyYXRvciA9IHNyY1NldExlbmd0aDsKLSAgICAgICAgfSBlbHNlIGlmIChzcmNTZXRBdHRyaWJ1 dGVbaW1hZ2VVcmxFbmQgLSAxXSA9PSAnLCcpIHsKLSAgICAgICAgICAgIC0taW1hZ2VVcmxFbmQ7 Ci0gICAgICAgICAgICBzZXBhcmF0b3IgPSBpbWFnZVVybEVuZDsKKyAgICAgICAgc2l6ZV90IGlt YWdlVVJMRW5kID0gc3Jjc2V0QXR0cmlidXRlLmZpbmQoaXNIVE1MU3BhY2UsIGltYWdlVVJMU3Rh cnQgKyAxKTsKKyAgICAgICAgaWYgKGltYWdlVVJMRW5kID09IG5vdEZvdW5kKSB7CisgICAgICAg ICAgICBpbWFnZVVSTEVuZCA9IHNyY3NldEF0dHJpYnV0ZUxlbmd0aDsKKyAgICAgICAgICAgIHNl cGFyYXRvciA9IHNyY3NldEF0dHJpYnV0ZUxlbmd0aDsKKyAgICAgICAgfSBlbHNlIGlmIChzcmNz ZXRBdHRyaWJ1dGVbaW1hZ2VVUkxFbmQgLSAxXSA9PSAnLCcpIHsKKyAgICAgICAgICAgIC0taW1h Z2VVUkxFbmQ7CisgICAgICAgICAgICBzZXBhcmF0b3IgPSBpbWFnZVVSTEVuZDsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIC8vIDcuIENvbGxlY3QgYSBzZXF1ZW5jZSBvZiBjaGFyYWN0 ZXJzIHRoYXQgYXJlIG5vdCAiLCIgKFUrMDAyQykgY2hhcmFjdGVycywgYW5kIGxldCB0aGF0IGJl IGRlc2NyaXB0b3JzLgotICAgICAgICAgICAgc2l6ZV90IGltYWdlU2NhbGVTdGFydCA9IHNyY1Nl dEF0dHJpYnV0ZS5maW5kKGlzTm90SFRNTFNwYWNlLCBpbWFnZVVybEVuZCArIDEpOworICAgICAg ICAgICAgc2l6ZV90IGltYWdlU2NhbGVTdGFydCA9IHNyY3NldEF0dHJpYnV0ZS5maW5kKGlzTm90 SFRNTFNwYWNlLCBpbWFnZVVSTEVuZCArIDEpOwogICAgICAgICAgICAgaWYgKGltYWdlU2NhbGVT dGFydCA9PSBub3RGb3VuZCkKLSAgICAgICAgICAgICAgICBzZXBhcmF0b3IgPSBzcmNTZXRMZW5n dGg7Ci0gICAgICAgICAgICBlbHNlIGlmIChzcmNTZXRBdHRyaWJ1dGVbaW1hZ2VTY2FsZVN0YXJ0 XSA9PSAnLCcpCisgICAgICAgICAgICAgICAgc2VwYXJhdG9yID0gc3Jjc2V0QXR0cmlidXRlTGVu Z3RoOworICAgICAgICAgICAgZWxzZSBpZiAoc3Jjc2V0QXR0cmlidXRlW2ltYWdlU2NhbGVTdGFy dF0gPT0gJywnKQogICAgICAgICAgICAgICAgIHNlcGFyYXRvciA9IGltYWdlU2NhbGVTdGFydDsK ICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIC8vIFRoaXMgcGFydCBkaWZmZXJz IGZyb20gdGhlIHNwZWMgYXMgdGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gb25seSBzdXBwb3J0 cyBwaXhlbCBkZW5zaXR5IGRlc2NyaXB0b3JzIGZvciBub3cuCi0gICAgICAgICAgICAgICAgc2l6 ZV90IGltYWdlU2NhbGVFbmQgPSBzcmNTZXRBdHRyaWJ1dGUuZmluZChpc0hUTUxTcGFjZU9yQ29t bWEsIGltYWdlU2NhbGVTdGFydCArIDEpOwotICAgICAgICAgICAgICAgIGltYWdlU2NhbGVFbmQg PSAoaW1hZ2VTY2FsZUVuZCA9PSBub3RGb3VuZCkgPyBzcmNTZXRMZW5ndGggOiBpbWFnZVNjYWxl RW5kOworICAgICAgICAgICAgICAgIHNpemVfdCBpbWFnZVNjYWxlRW5kID0gc3Jjc2V0QXR0cmli dXRlLmZpbmQoaXNIVE1MU3BhY2VPckNvbW1hLCBpbWFnZVNjYWxlU3RhcnQgKyAxKTsKKyAgICAg ICAgICAgICAgICBpbWFnZVNjYWxlRW5kID0gKGltYWdlU2NhbGVFbmQgPT0gbm90Rm91bmQpID8g c3Jjc2V0QXR0cmlidXRlTGVuZ3RoIDogaW1hZ2VTY2FsZUVuZDsKICAgICAgICAgICAgICAgICBz aXplX3QgY29tbWFQb3NpdGlvbiA9IGltYWdlU2NhbGVFbmQ7CiAgICAgICAgICAgICAgICAgLy8g TWFrZSBzdXJlIHRoZXJlIGFyZSBubyBvdGhlciBkZXNjcmlwdG9ycy4KLSAgICAgICAgICAgICAg ICB3aGlsZSAoKGNvbW1hUG9zaXRpb24gPCBzcmNTZXRMZW5ndGggLSAxKSAmJiBpc0hUTUxTcGFj ZShzcmNTZXRBdHRyaWJ1dGVbY29tbWFQb3NpdGlvbl0pKQorICAgICAgICAgICAgICAgIHdoaWxl ICgoY29tbWFQb3NpdGlvbiA8IHNyY3NldEF0dHJpYnV0ZUxlbmd0aCAtIDEpICYmIGlzSFRNTFNw YWNlKHNyY3NldEF0dHJpYnV0ZVtjb21tYVBvc2l0aW9uXSkpCiAgICAgICAgICAgICAgICAgICAg ICsrY29tbWFQb3NpdGlvbjsKICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgZmlyc3Qgbm90IGh0 bWwgc3BhY2UgY2hhcmFjdGVyIGFmdGVyIHRoZSBzY2FsZSBtb2RpZmllciBpcyBub3QgYSBjb21t YSwKICAgICAgICAgICAgICAgICAvLyB0aGUgY3VycmVudCBjYW5kaWRhdGUgaXMgYW4gaW52YWxp ZCBpbnB1dC4KLSAgICAgICAgICAgICAgICBpZiAoKGNvbW1hUG9zaXRpb24gPCBzcmNTZXRMZW5n dGggLSAxKSAmJiBzcmNTZXRBdHRyaWJ1dGVbY29tbWFQb3NpdGlvbl0gIT0gJywnKSB7CisgICAg ICAgICAgICAgICAgaWYgKChjb21tYVBvc2l0aW9uIDwgc3Jjc2V0QXR0cmlidXRlTGVuZ3RoIC0g MSkgJiYgc3Jjc2V0QXR0cmlidXRlW2NvbW1hUG9zaXRpb25dICE9ICcsJykgewogICAgICAgICAg ICAgICAgICAgICAvLyBGaW5kIHRoZSBuZWFyZXN0IGNvbW1hIGFuZCBza2lwIHRoZSBpbnB1dC4K LSAgICAgICAgICAgICAgICAgICAgY29tbWFQb3NpdGlvbiA9IHNyY1NldEF0dHJpYnV0ZS5maW5k KCcsJywgY29tbWFQb3NpdGlvbiArIDEpOworICAgICAgICAgICAgICAgICAgICBjb21tYVBvc2l0 aW9uID0gc3Jjc2V0QXR0cmlidXRlLmZpbmQoJywnLCBjb21tYVBvc2l0aW9uICsgMSk7CiAgICAg ICAgICAgICAgICAgICAgIGlmIChjb21tYVBvc2l0aW9uID09IG5vdEZvdW5kKQogICAgICAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGltYWdlQ2FuZGlkYXRl U3RhcnQgPSBjb21tYVBvc2l0aW9uICsgMTsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHNlcGFyYXRvciA9IGNvbW1hUG9z aXRpb247Ci0gICAgICAgICAgICAgICAgaWYgKHNyY1NldEF0dHJpYnV0ZVtpbWFnZVNjYWxlRW5k IC0gMV0gIT0gJ3gnKSB7CisgICAgICAgICAgICAgICAgaWYgKHNyY3NldEF0dHJpYnV0ZVtpbWFn ZVNjYWxlRW5kIC0gMV0gIT0gJ3gnKSB7CiAgICAgICAgICAgICAgICAgICAgIGltYWdlQ2FuZGlk YXRlU3RhcnQgPSBzZXBhcmF0b3IgKyAxOwogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYm9vbCB2YWxpZFNjYWxlRmFjdG9y ID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgc2l6ZV90IHNjYWxlRmFjdG9yTGVuZ3RoV2l0aG91 dFVuaXQgPSBpbWFnZVNjYWxlRW5kIC0gaW1hZ2VTY2FsZVN0YXJ0IC0gMTsKLSAgICAgICAgICAg ICAgICBpbWdTY2FsZUZhY3RvciA9IGNoYXJhY3RlcnNUb0Zsb2F0KHNyY1NldEF0dHJpYnV0ZS5j aGFyYWN0ZXJzKCkgKyBpbWFnZVNjYWxlU3RhcnQsIHNjYWxlRmFjdG9yTGVuZ3RoV2l0aG91dFVu aXQsICZ2YWxpZFNjYWxlRmFjdG9yKTsKKyAgICAgICAgICAgICAgICBpbWFnZVNjYWxlRmFjdG9y ID0gY2hhcmFjdGVyc1RvRmxvYXQoc3Jjc2V0QXR0cmlidXRlLmNoYXJhY3RlcnMoKSArIGltYWdl U2NhbGVTdGFydCwgc2NhbGVGYWN0b3JMZW5ndGhXaXRob3V0VW5pdCwgJnZhbGlkU2NhbGVGYWN0 b3IpOwogCiAgICAgICAgICAgICAgICAgaWYgKCF2YWxpZFNjYWxlRmFjdG9yKSB7CiAgICAgICAg ICAgICAgICAgICAgIGltYWdlQ2FuZGlkYXRlU3RhcnQgPSBzZXBhcmF0b3IgKyAxOwpAQCAtMzg4 LDggKzM5MCw4IEBAIHN0YXRpYyB2b2lkIHBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY1MKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBJbWFnZVdpdGhTY2FsZSBpbWFnZTsKLSAg ICAgICAgaW1hZ2UuaW1hZ2VVUkwgPSBTdHJpbmdJbXBsOjpjcmVhdGVXaXRob3V0Q29weWluZyhz cmNTZXRBdHRyaWJ1dGUuY2hhcmFjdGVycygpICsgaW1hZ2VVcmxTdGFydCwgaW1hZ2VVcmxFbmQg LSBpbWFnZVVybFN0YXJ0KTsKLSAgICAgICAgaW1hZ2Uuc2NhbGVGYWN0b3IgPSBpbWdTY2FsZUZh Y3RvcjsKKyAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgPSBTdHJpbmcoc3Jjc2V0QXR0cmlidXRlLmNo YXJhY3RlcnMoKSArIGltYWdlVVJMU3RhcnQsIGltYWdlVVJMRW5kIC0gaW1hZ2VVUkxTdGFydCk7 CisgICAgICAgIGltYWdlLnNjYWxlRmFjdG9yID0gaW1hZ2VTY2FsZUZhY3RvcjsKIAogICAgICAg ICBpbWFnZUNhbmRpZGF0ZXMuYXBwZW5kKGltYWdlKTsKICAgICAgICAgLy8gMTEuIFJldHVybiB0 byB0aGUgc3RlcCBsYWJlbGVkIHNwbGl0dGluZyBsb29wLgpAQCAtMzk3LDExICszOTksMTEgQEAg c3RhdGljIHZvaWQgcGFyc2VJbWFnZXNXaXRoU2NhbGVGcm9tU3JjUwogICAgIH0KIH0KIAotU3Ry aW5nIGJlc3RGaXRTb3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMoZmxvYXQgZGV2aWNlU2NhbGVGYWN0 b3IsIGNvbnN0IFN0cmluZyYgc3JjQXR0cmlidXRlLCBjb25zdCBTdHJpbmcmIHNyY1NldEF0dHJp YnV0ZSkKK1N0cmluZyBiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmlj ZVNjYWxlRmFjdG9yLCBjb25zdCBTdHJpbmcmIHNyY0F0dHJpYnV0ZSwgY29uc3QgU3RyaW5nJiBz cmNzZXRBdHRyaWJ1dGUpCiB7CiAgICAgSW1hZ2VDYW5kaWRhdGVzIGltYWdlQ2FuZGlkYXRlczsK IAotICAgIHBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY1NldEF0dHJpYnV0ZShzcmNTZXRBdHRy aWJ1dGUsIGltYWdlQ2FuZGlkYXRlcyk7CisgICAgcGFyc2VJbWFnZXNXaXRoU2NhbGVGcm9tU3Jj c2V0QXR0cmlidXRlKHNyY3NldEF0dHJpYnV0ZSwgaW1hZ2VDYW5kaWRhdGVzKTsKIAogICAgIGNv bnN0IFN0cmluZyBzcmMgPSAgc3JjQXR0cmlidXRlLnNpbXBsaWZ5V2hpdGVTcGFjZShpc0hUTUxT cGFjZSk7CiAgICAgaWYgKCFzcmMuaXNFbXB0eSgpKSB7Cg==