70274 2011-10-17 15:14:16 -0700 WebVTT parser should not allow timestamps that have no spaces 2011-10-24 17:26:08 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annacc annacc eric.carlson silviapfeiffer1 webkit.review.bot oldest_to_newest 485548 0 annacc 2011-10-17 15:14:16 -0700 Timestamps like this should not be allowed: 00:04:01.000-->00:03:00.500 They should instead be required to have at least one whitespace character between the startTime/endTime and the arrow: 00:04:01.000 --> 00:03:00.500 485564 1 111332 annacc 2011-10-17 15:32:23 -0700 Created attachment 111332 Patch 485565 2 webkit.review.bot 2011-10-17 15:36:08 -0700 Attachment 111332 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit', '--chromium']" exit_code: 2 Updating OpenSource From git://git.webkit.org/WebKit c0d4f37..d10d208 master -> origin/master M Source/WebCore/ChangeLog M Source/WebCore/html/HTMLKeygenElement.h M Source/WebCore/html/HTMLKeygenElement.cpp r97658 = c627b94a38756dd0cde4d64c2288f36bff87ce20 (refs/remotes/trunk) A LayoutTests/fast/mutation/observe-attributes-expected.txt A LayoutTests/fast/mutation/observe-attributes.html M LayoutTests/ChangeLog M Source/WebCore/dom/MutationRecord.idl M Source/WebCore/dom/MutationRecord.cpp M Source/WebCore/dom/Element.cpp M Source/WebCore/dom/Node.h M Source/WebCore/dom/WebKitMutationObserver.h M Source/WebCore/dom/NodeRareData.h M Source/WebCore/dom/MutationRecord.h M Source/WebCore/dom/Node.cpp M Source/WebCore/dom/WebKitMutationObserver.cpp M Source/WebCore/ChangeLog M Source/WebCore/bindings/v8/V8Proxy.cpp M Source/WebCore/WebCore.xcodeproj/project.pbxproj r97659 = d10d208ef8dc738eb8d45c331840c61c2c779498 (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Updating chromium port dependencies using gclient... Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Error: 'depot_tools/gclient sync' failed 3 tries and returned 256 at Tools/Scripts/update-webkit-chromium line 107. Re-trying 'depot_tools/gclient sync' No such file or directory at Tools/Scripts/update-webkit line 104. If any of these errors are false positives, please file a bug against check-webkit-style. 485575 3 silviapfeiffer1 2011-10-17 15:48:58 -0700 Hmm, the spec at http://www.whatwg.org/specs/web-apps/current-work/webvtt.html currently states only the U+0020 SPACE character as a valid separator between the "-->" string and the timestamps. This accepts other white space as separators, too, in particular isASpace() accepts also U+0009 CHARACTER TABULATION (tab), U+000A LINE FEED (LF), U+000C FORM FEED (FF), and U+000D CARRIAGE RETURN. I've just registered a bug on the spec to allow the TAB character as a separator, see http://www.w3.org/Bugs/Public/show_bug.cgi?id=14487. But I do not believe the newline characters should be allowed. 485594 4 annacc 2011-10-17 16:08:47 -0700 I agree line terminators should not be allowed, but collectTimingsAndSettings() is only ever handed a single line (so it will not have any line terminators). Perhaps the use of isASpace() is confusing here, would it be more clear to just check for ' ' and/or '\t' instead of using isASpace()? 486469 5 111538 annacc 2011-10-18 17:34:50 -0700 Created attachment 111538 Patch How about we make sure that at least one space separates the time from the --> for now? We can always update if more whitespace characters are allowed in the future. 486471 6 silviapfeiffer1 2011-10-18 17:38:49 -0700 Works for me. :-) 486487 7 111543 annacc 2011-10-18 18:07:36 -0700 Created attachment 111543 adding check for tabs Ha, one of our tests (tc008-timings-no-hour-errors.vtt) checks for tabs, so at least WE think tabs should be allowed. Adding that here. 487051 8 111543 webkit.review.bot 2011-10-19 15:29:12 -0700 Comment on attachment 111543 adding check for tabs Clearing flags on attachment: 111543 Committed r97883: <http://trac.webkit.org/changeset/97883> 487052 9 webkit.review.bot 2011-10-19 15:29:16 -0700 All reviewed patches have been landed. Closing bug. 489795 10 silviapfeiffer1 2011-10-24 17:10:03 -0700 As of a few hours ago, the spec now also tolerates tabs, see http://www.w3.org/Bugs/Public/show_bug.cgi?id=14487 . We should add this. 489808 11 annacc 2011-10-24 17:26:08 -0700 Great! We too allow both spaces and tabs, so looks like we are good to go. A small note: the parser in the spec currently allows *0 or more* space or tab characters, not *1 or more* space or tab characters as specified in Ian's change. Our implementation now enforces at least 1 space or tab character (so that [time]-->[time] without any spaces or tabs is not allowed). 111332 2011-10-17 15:32:23 -0700 2011-10-18 17:34:47 -0700 Patch bug-70274-20111017153221.patch text/plain 2291 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTc2NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNTZmMDA5ZDNiODQyNmEy ODQ0ODI3MGNlMDQ3ZGFjYTU2MTliNWY3Li4xYTBmZWZjMGU1MTdlYzdiZDg5YzZiZjk5ZjliYzJj MzZiZWJhMWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMTcgIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVwZGF0ZSBXZWJWVFRQ YXJzZXIgdG8gcmVxdWlyZSBhdCBsZWFzdCBvbmUgd2hpdGVzcGFjZSBiZXR3ZWVuIHRpZW1zdGFt cHMgYW5kIGFycm93cywgZS5nLjoKKyAgICAgICAgMDA6MDQ6MDEuMDAwIC0tPiAwMDowMzowMC41 MDAgaXMgT0sKKyAgICAgICAgMDA6MDQ6MDEuMDAwLS0+MDA6MDM6MDAuNTAwIGlzIG5vdCBPSwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAyNzQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeGlzdGluZyB0 ZXN0czoKKyAgICAgICAgbWVkaWEvdHJhY2svdHJhY2std2VidnR0LXRjMDA4LXRpbWluZ3Mtbm8t aG91cnMuaHRtbAorICAgICAgICAoc2VlIG1lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC90YzAw OC10aW1pbmdzLW5vLWhvdXItZXJyb3JzLnZ0dCAjNikKKyAgICAgICAgbWVkaWEvdHJhY2svdHJh Y2std2VidnR0LXRjMDA5LXRpbWluZ3MtaG91ci5odG1sCisgICAgICAgIChzZWUgbWVkaWEvdHJh Y2svY2FwdGlvbnMtd2VidnR0L3RjMDA5LXRpbWluZ3MtaG91ci1lcnJvci52dHQgIzYpIAorCisg ICAgICAgICogaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V2ViVlRUUGFyc2VyOjpjb2xsZWN0VGltaW5nc0FuZFNldHRpbmdzKTogQ2hlY2sgdGhhdCB0aGUK KyAgICAgICAgICAgIGNoYXJhY3RlciBiZWZvcmUgYW5kIGFmdGVyIHRoZSAnLS0+JyBpcyBhIHdo aXRlc3BhY2UgY2hhcmFjdGVyCisKIDIwMTEtMDktMjIgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBpbmNvcnJlY3QgaGVpZ2h0IHdpdGggaGVpZ2h0OmF1dG8gYW5k IHdyaXRpbmctbW9kZTp2ZXJ0aWNhbC1ybApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC90cmFjay9XZWJWVFRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJW VFRQYXJzZXIuY3BwCmluZGV4IDFiMjU4ZGYyMzYxZjk2ZGJkZGRlMGMzYWI1ZGY5NjhmYzNjNjNm M2YuLmY5ZjQ2NThiMjRlOWZhZTc4NmQ2YzQwMmUwNTZiY2FkNGU5ODQ2ZmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKQEAgLTE2NiwxMiArMTY2LDE2IEBA IFdlYlZUVFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJzZXI6OmNvbGxlY3RUaW1pbmdzQW5k U2V0dGluZ3MoY29uc3QgU3RyaW5nJiBsCiAgICAgbV9jdXJyZW50U3RhcnRUaW1lID0gY29sbGVj dFRpbWVTdGFtcChsaW5lLCAmcG9zaXRpb24pOwogICAgIGlmIChtX2N1cnJlbnRTdGFydFRpbWUg PT0gbWFsZm9ybWVkVGltZSkKICAgICAgICAgcmV0dXJuIEJhZEN1ZTsKKyAgICBpZiAoIWlzQVNw YWNlKGxpbmVbcG9zaXRpb24rK10pKQorICAgICAgICByZXR1cm4gQmFkQ3VlOwogICAgIHNraXBX aGl0ZVNwYWNlKGxpbmUsICZwb3NpdGlvbik7CiAKICAgICAvLyA2LTkgLSBJZiB0aGUgbmV4dCB0 aHJlZSBjaGFyYWN0ZXJzIGFyZSBub3QgIi0tPiIsIGFib3J0IGFuZCByZXR1cm4gZmFpbHVyZS4K ICAgICBpZiAobGluZS5maW5kKCItLT4iLCBwb3NpdGlvbikgPT0gbm90Rm91bmQpCiAgICAgICAg IHJldHVybiBCYWRDdWU7CiAgICAgcG9zaXRpb24gKz0gMzsKKyAgICBpZiAoIWlzQVNwYWNlKGxp bmVbcG9zaXRpb24rK10pKQorICAgICAgICByZXR1cm4gQmFkQ3VlOwogICAgIHNraXBXaGl0ZVNw YWNlKGxpbmUsICZwb3NpdGlvbik7CiAKICAgICAvLyAxMC0xMSAtIENvbGxlY3QgYSBXZWJWVFQg dGltZXN0YW1wLiBJZiB0aGF0IGZhaWxzLCB0aGVuIGFib3J0IGFuZCByZXR1cm4gZmFpbHVyZS4g T3RoZXJ3aXNlLCBsZXQgY3VlJ3MgdGV4dCB0cmFjayBjdWUgZW5kIHRpbWUgYmUgdGhlIGNvbGxl Y3RlZCB0aW1lLgo= 111538 2011-10-18 17:34:50 -0700 2011-10-18 18:07:32 -0700 Patch bug-70274-20111018173449.patch text/plain 2298 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTc4MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmZjNDhkNDlhYzNkYWE2 MDRlN2ZjMDZiMmE1NjNiZmZiYjM0Y2E2Li4xY2NmNTE3YWZkZmJjZWRlOGYyYTk4Yjc5ODk5ODk2 YzY2ZWExYzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMTggIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVwZGF0ZSBXZWJWVFRQ YXJzZXIgdG8gcmVxdWlyZSBhdCBsZWFzdCBvbmUgc3BhY2UgYmV0d2VlbiB0aW1lc3RhbXBzIGFu ZCBhcnJvd3MsIGUuZy46CisgICAgICAgIDAwOjA0OjAxLjAwMCAtLT4gMDA6MDM6MDAuNTAwIGlz IE9LCisgICAgICAgIDAwOjA0OjAxLjAwMC0tPjAwOjAzOjAwLjUwMCBpcyBub3QgT0sKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMjc0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhpc3RpbmcgdGVzdHM6 CisgICAgICAgIG1lZGlhL3RyYWNrL3RyYWNrLXdlYnZ0dC10YzAwOC10aW1pbmdzLW5vLWhvdXJz Lmh0bWwKKyAgICAgICAgKHNlZSBtZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvdGMwMDgtdGlt aW5ncy1uby1ob3VyLWVycm9ycy52dHQgIzYpCisgICAgICAgIG1lZGlhL3RyYWNrL3RyYWNrLXdl YnZ0dC10YzAwOS10aW1pbmdzLWhvdXIuaHRtbAorICAgICAgICAoc2VlIG1lZGlhL3RyYWNrL2Nh cHRpb25zLXdlYnZ0dC90YzAwOS10aW1pbmdzLWhvdXItZXJyb3IudnR0ICM2KSAKKworICAgICAg ICAqIGh0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlZU VFBhcnNlcjo6Y29sbGVjdFRpbWluZ3NBbmRTZXR0aW5ncyk6IENoZWNrIHRoYXQgdGhlCisgICAg ICAgICAgICBjaGFyYWN0ZXIgYmVmb3JlIGFuZCBhZnRlciB0aGUgJy0tPicgaXMgYSBzcGFjZSBj aGFyYWN0ZXIKKwogMjAxMS0xMC0xOCAgQWRhbSBLbGVpbiAgPGFkYW1rQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbTXV0YXRpb25PYnNlcnZlcnNdIEltcGxlbWVudCBXZWJLaXRNdXRhdGlvbk9i c2VydmVyLm9ic2VydmUgZm9yIGNoYXJhY3RlckRhdGEgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCmluZGV4IGQ4MmM2NjRiODQ1YTk0ZGVlMmE3OTBk MTczZTBlMTM0N2VjODhhMGIuLjZkZWMyMmE4Yjg3YjIzMWYzYWFhNDBlMjFiZTc5MWYwOTQ5NzE3 MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKQEAgLTE5 MCwxMiArMTkwLDE2IEBAIFdlYlZUVFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJzZXI6OmNv bGxlY3RUaW1pbmdzQW5kU2V0dGluZ3MoY29uc3QgU3RyaW5nJiBsCiAgICAgbV9jdXJyZW50U3Rh cnRUaW1lID0gY29sbGVjdFRpbWVTdGFtcChsaW5lLCAmcG9zaXRpb24pOwogICAgIGlmIChtX2N1 cnJlbnRTdGFydFRpbWUgPT0gbWFsZm9ybWVkVGltZSkKICAgICAgICAgcmV0dXJuIEJhZEN1ZTsK KyAgICBpZiAobGluZVtwb3NpdGlvbisrXSAhPSAnICcpCisgICAgICAgIHJldHVybiBCYWRDdWU7 CiAgICAgc2tpcFdoaXRlU3BhY2UobGluZSwgJnBvc2l0aW9uKTsKIAogICAgIC8vIDYtOSAtIElm IHRoZSBuZXh0IHRocmVlIGNoYXJhY3RlcnMgYXJlIG5vdCAiLS0+IiwgYWJvcnQgYW5kIHJldHVy biBmYWlsdXJlLgogICAgIGlmIChsaW5lLmZpbmQoIi0tPiIsIHBvc2l0aW9uKSA9PSBub3RGb3Vu ZCkKICAgICAgICAgcmV0dXJuIEJhZEN1ZTsKICAgICBwb3NpdGlvbiArPSAzOworICAgIGlmIChs aW5lW3Bvc2l0aW9uKytdICE9ICcgJykKKyAgICAgICAgcmV0dXJuIEJhZEN1ZTsKICAgICBza2lw V2hpdGVTcGFjZShsaW5lLCAmcG9zaXRpb24pOwogCiAgICAgLy8gMTAtMTEgLSBDb2xsZWN0IGEg V2ViVlRUIHRpbWVzdGFtcC4gSWYgdGhhdCBmYWlscywgdGhlbiBhYm9ydCBhbmQgcmV0dXJuIGZh aWx1cmUuIE90aGVyd2lzZSwgbGV0IGN1ZSdzIHRleHQgdHJhY2sgY3VlIGVuZCB0aW1lIGJlIHRo ZSBjb2xsZWN0ZWQgdGltZS4K 111543 2011-10-18 18:07:36 -0700 2011-10-19 15:29:12 -0700 adding check for tabs bug-70274-20111018180735.patch text/plain 2354 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTc4MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmZjNDhkNDlhYzNkYWE2 MDRlN2ZjMDZiMmE1NjNiZmZiYjM0Y2E2Li4xY2NmNTE3YWZkZmJjZWRlOGYyYTk4Yjc5ODk5ODk2 YzY2ZWExYzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMTggIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVwZGF0ZSBXZWJWVFRQ YXJzZXIgdG8gcmVxdWlyZSBhdCBsZWFzdCBvbmUgc3BhY2UgYmV0d2VlbiB0aW1lc3RhbXBzIGFu ZCBhcnJvd3MsIGUuZy46CisgICAgICAgIDAwOjA0OjAxLjAwMCAtLT4gMDA6MDM6MDAuNTAwIGlz IE9LCisgICAgICAgIDAwOjA0OjAxLjAwMC0tPjAwOjAzOjAwLjUwMCBpcyBub3QgT0sKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMjc0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhpc3RpbmcgdGVzdHM6 CisgICAgICAgIG1lZGlhL3RyYWNrL3RyYWNrLXdlYnZ0dC10YzAwOC10aW1pbmdzLW5vLWhvdXJz Lmh0bWwKKyAgICAgICAgKHNlZSBtZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvdGMwMDgtdGlt aW5ncy1uby1ob3VyLWVycm9ycy52dHQgIzYpCisgICAgICAgIG1lZGlhL3RyYWNrL3RyYWNrLXdl YnZ0dC10YzAwOS10aW1pbmdzLWhvdXIuaHRtbAorICAgICAgICAoc2VlIG1lZGlhL3RyYWNrL2Nh cHRpb25zLXdlYnZ0dC90YzAwOS10aW1pbmdzLWhvdXItZXJyb3IudnR0ICM2KSAKKworICAgICAg ICAqIGh0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlZU VFBhcnNlcjo6Y29sbGVjdFRpbWluZ3NBbmRTZXR0aW5ncyk6IENoZWNrIHRoYXQgdGhlCisgICAg ICAgICAgICBjaGFyYWN0ZXIgYmVmb3JlIGFuZCBhZnRlciB0aGUgJy0tPicgaXMgYSBzcGFjZSBj aGFyYWN0ZXIKKwogMjAxMS0xMC0xOCAgQWRhbSBLbGVpbiAgPGFkYW1rQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbTXV0YXRpb25PYnNlcnZlcnNdIEltcGxlbWVudCBXZWJLaXRNdXRhdGlvbk9i c2VydmVyLm9ic2VydmUgZm9yIGNoYXJhY3RlckRhdGEgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCmluZGV4IGQ4MmM2NjRiODQ1YTk0ZGVlMmE3OTBk MTczZTBlMTM0N2VjODhhMGIuLmU5ZDAxZDU3ZDRlMzQ0NGIyMzg2ZDhjNjQyYzA5NGE2NGI2NGJk M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKQEAgLTE5 MCwxMiArMTkwLDE2IEBAIFdlYlZUVFBhcnNlcjo6UGFyc2VTdGF0ZSBXZWJWVFRQYXJzZXI6OmNv bGxlY3RUaW1pbmdzQW5kU2V0dGluZ3MoY29uc3QgU3RyaW5nJiBsCiAgICAgbV9jdXJyZW50U3Rh cnRUaW1lID0gY29sbGVjdFRpbWVTdGFtcChsaW5lLCAmcG9zaXRpb24pOwogICAgIGlmIChtX2N1 cnJlbnRTdGFydFRpbWUgPT0gbWFsZm9ybWVkVGltZSkKICAgICAgICAgcmV0dXJuIEJhZEN1ZTsK KyAgICBpZiAobGluZVtwb3NpdGlvbisrXSAhPSAnICcgJiYgbGluZVtwb3NpdGlvbisrXSAhPSAn XHQnKQorICAgICAgICByZXR1cm4gQmFkQ3VlOwogICAgIHNraXBXaGl0ZVNwYWNlKGxpbmUsICZw b3NpdGlvbik7CiAKICAgICAvLyA2LTkgLSBJZiB0aGUgbmV4dCB0aHJlZSBjaGFyYWN0ZXJzIGFy ZSBub3QgIi0tPiIsIGFib3J0IGFuZCByZXR1cm4gZmFpbHVyZS4KICAgICBpZiAobGluZS5maW5k KCItLT4iLCBwb3NpdGlvbikgPT0gbm90Rm91bmQpCiAgICAgICAgIHJldHVybiBCYWRDdWU7CiAg ICAgcG9zaXRpb24gKz0gMzsKKyAgICBpZiAobGluZVtwb3NpdGlvbisrXSAhPSAnICcgJiYgbGlu ZVtwb3NpdGlvbisrXSAhPSAnXHQnKQorICAgICAgICByZXR1cm4gQmFkQ3VlOwogICAgIHNraXBX aGl0ZVNwYWNlKGxpbmUsICZwb3NpdGlvbik7CiAKICAgICAvLyAxMC0xMSAtIENvbGxlY3QgYSBX ZWJWVFQgdGltZXN0YW1wLiBJZiB0aGF0IGZhaWxzLCB0aGVuIGFib3J0IGFuZCByZXR1cm4gZmFp bHVyZS4gT3RoZXJ3aXNlLCBsZXQgY3VlJ3MgdGV4dCB0cmFjayBjdWUgZW5kIHRpbWUgYmUgdGhl IGNvbGxlY3RlZCB0aW1lLgo=