174044 2017-06-30 14:48:13 -0700 RegExp's anchored with .* with \g flag can return wrong match start for strings with multiple matches 2017-10-11 10:19:06 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff bfulgham buildbot keith_miller mark.lam oliver saam webkit-bug-importer oldest_to_newest 1324551 0 msaboff 2017-06-30 14:48:13 -0700 Consider the string: s = "\na\na\na\n"; along with the RegExp: r = new RegExp(".*\\s.*", "g"); The result of s.match(r) should be a match object with 4 entries, "\na", "\na", "\na" & "\n". Instead we get "\na", "a\na", "a\na" & "a\n". 1324567 1 msaboff 2017-06-30 15:11:02 -0700 <rdar://problem/33018426> 1324575 2 314302 msaboff 2017-06-30 15:23:07 -0700 Created attachment 314302 Patch 1324591 3 314302 oliver 2017-06-30 15:44:25 -0700 Comment on attachment 314302 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314302&action=review > Source/JavaScriptCore/yarr/YarrJIT.cpp:2699 > + if (m_pattern.m_saveInitialStartValue) { > +#ifdef HAVE_INITIAL_START_REG > + move(index, initialStart); > +#else > + storeToFrame(index, m_pattern.m_initialStartValueFrameLocation); > +#endif I almost wish we could bludgeon templates into doing this for us. Almost. (I suspect it would turn into "can I implement register allocation with templates at compile time?" questions :D ) 1324691 4 msaboff 2017-06-30 18:17:01 -0700 Committed r219031: <http://trac.webkit.org/changeset/219031> 314302 2017-06-30 15:23:07 -0700 2017-06-30 15:44:25 -0700 Patch 174044.patch text/plain 11653 msaboff SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTkwMTgpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE3LTA2LTMwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBw bGUuY29tPgorCisgICAgICAgIFJlZ0V4cCdzICBhbmNob3JlZCB3aXRoIC4qIHdpdGggXGcgZmxh ZyBjYW4gcmV0dXJuIHdyb25nIG1hdGNoIHN0YXJ0IGZvciBzdHJpbmdzIHdpdGggbXVsdGlwbGUg bWF0Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc0MDQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TmV3IHJlZ3Jlc3Npb24gdGVzdC4KKworICAgICAgICAqIHN0cmVzcy9yZWdyZXNzLTE3NDA0NC5q czogQWRkZWQuCisgICAgICAgICh0ZXN0MSk6CisgICAgICAgICh0ZXN0Mik6CisKIDIwMTctMDYt MzAgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdFeHBDYWNo ZWRSZXN1bHQ6OnNldElucHV0IHNob3VsZCByZWlmeSBsZWZ0IGFuZCByaWdodCBjb250ZXh0cwpJ bmRleDogSlNUZXN0cy9zdHJlc3MvcmVncmVzcy0xNzQwNDQuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNU ZXN0cy9zdHJlc3MvcmVncmVzcy0xNzQwNDQuanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9z dHJlc3MvcmVncmVzcy0xNzQwNDQuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzNyBAQAor Ly8gUmVncmVzc2lvbiB0ZXN0IGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc0MDQ0LiAgVGhpcyB0ZXN0IHNob3VsZCBub3QgdGhyb3cgb3IgY3Jhc2guCisKK2Z1 bmN0aW9uIHRlc3QxKCkKK3sKKyAgICBsZXQgZXhwZWN0ZWQgPSBbIlxuYSIsICJcbmEiLCAiXG5h IiwgIlxuIl07CisKKyAgICBsZXQgc3RyID0gIlxuYVxuYVxuYVxuIjsKKyAgICBsZXQgcmUgPSBu ZXcgUmVnRXhwKCIuKlxccy4qIiwgImciKTsKKworICAgIGxldCBtYXRjaCA9IHN0ci5tYXRjaChy ZSk7CisKKyAgICBpZiAobWF0Y2gubGVuZ3RoICE9IGV4cGVjdGVkLmxlbmd0aCkKKyAgICAgICAg dGhyb3cgIkV4cGVjdGVkIG1hdGNoLmxlbmd0aCBvZiAiICsgZXhwZWN0ZWQubGVuZ3RoICsgIiwg Z290ICIgKyBtYXRjaC5sZW5ndGg7CisKKyAgICBmb3IgKGxldCBpID0gMDsgaSA8IGV4cGVjdGVk Lmxlbmd0aDsgaSsrKSB7CisgICAgICAgIGlmIChtYXRjaFtpXSAhPSBleHBlY3RlZFtpXSkKKyAg ICAgICAgICAgIHRocm93ICJFeHBlY3RlZCBtYXRjaFsiICsgaSArICJdIHRvIGJlIFwiIiArIGV4 cGVjdGVkW2ldICsgIlwiLCBnb3QgXCIiICsgbWF0Y2hbaV0gKyAiXCIiOworICAgIH0KK30KKwor ZnVuY3Rpb24gdGVzdDIoKQoreworICAgIGxldCByZXN1bHQgPSB1bmRlZmluZWQ7CisKKyAgICBs ZXQgcmUgPSBuZXcgUmVnRXhwKCIuKlxccy4qIiwgImciKTsKKyAgICBsZXQgc3RyID0gIlxuYVxu IjsKKyAgICByZXN1bHQgPSBzdHIucmVwbGFjZShyZSwneCcpOworCisgICAgaWYgKHJlc3VsdCAh PSAieHgiKQorICAgICAgICB0aHJvdyAiRXhwZWN0ZWQgcmVzdWx0IG9mIFwieHhcIiwgZ290IFwi IiArIHJlc3VsdCArICJcIiI7Cit9CisKK2ZvciAobGV0IGkgPSAwOyBpIDwgNTAwMDsgaSsrKQor ICAgIHRlc3QxKCk7CisKK2ZvciAobGV0IGkgPSAwOyBpIDwgNTAwMDsgaSsrKQorICAgIHRlc3Qy KCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODkzMikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwz MiBAQAorMjAxNy0wNi0zMCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZWdFeHAncyAgYW5jaG9yZWQgd2l0aCAuKiB3aXRoIFxnIGZsYWcgY2FuIHJldHVy biB3cm9uZyBtYXRjaCBzdGFydCBmb3Igc3RyaW5ncyB3aXRoIG11bHRpcGxlIG1hdGNoZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDA0NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSAuKiBlbmNs b3N1cmUgb3B0aW1pemF0aW9uIGRpZG4ndCByZXNwZWN0IHRoYXQgd2UgY2FuIHN0YXJ0IG1hdGNo aW5nIGZyb20gYSBub24temVybworICAgICAgICBpbmRleC4gIFRoaXMgb3B0aW1pemF0aW9uIHRy ZWF0cyAvLio8c29tZS10ZXJtcz4uKi8gYnkgZmlyc3QgbWF0Y2hpbmcgdGhlIDxzb21lLXRlcm1z PiBhbmQKKyAgICAgICAgdGhlbiBmaW5kaW5nIHRoZSBleHRlbnQgb2YgdGhlIG1hdGNoIGJ5IGdv aW5nIGJhY2sgdG8gdGhlIGJlZ2lubmluZyBvZiB0aGUgbGluZSBhbmQgZ29pbmcKKyAgICAgICAg Zm9yd2FyZCB0byB0aGUgZW5kIG9mIHRoZSBsaW5lLiAgVGhlIGNvZGUgdGhhdCB3ZW50IGJhY2sg dG8gdGhlIGJlZ2lubmluZyBvZiB0aGUgbGluZQorICAgICAgICBjaGVja2VkIGZvciBhbiBpbmRl eCBvZiAwIGluc3RlYWQgb2YgY29tcGFyaW5nIHRoZSBpbmRleCB0byB0aGUgc3RhcnQgcG9zaXRp b24uICBUaGlzIHN0YXJ0CisgICAgICAgIHBvc2l0aW9uIGlzIHBhc3NlZCBhcyB0aGUgaW5pdGlh bCBpbmRleC4KKworICAgICAgICBBZGRlZCBhbm90aGVyIHRlbXBvcmFyeSByZWdpc3RlciB0byB0 aGUgWUFSUiBKSVQgdG8gY29udGFpbiB0aGUgc3RhcnQgcG9zaXRpb24gZm9yCisgICAgICAgIHBs YXRmb3JtcyB0aGF0IGhhdmUgc3BhcmUgcmVnaXN0ZXJzLgorCisgICAgICAgICogeWFyci9ZYXJy Lmg6CisgICAgICAgICogeWFyci9ZYXJySW50ZXJwcmV0ZXIuY3BwOgorICAgICAgICAoSlNDOjpZ YXJyOjpJbnRlcnByZXRlcjo6bWF0Y2hEb3RTdGFyRW5jbG9zdXJlKToKKyAgICAgICAgKEpTQzo6 WWFycjo6SW50ZXJwcmV0ZXI6OkludGVycHJldGVyKToKKyAgICAgICAgKiB5YXJyL1lhcnJKSVQu Y3BwOgorICAgICAgICAoSlNDOjpZYXJyOjpZYXJyR2VuZXJhdG9yOjpnZW5lcmF0ZURvdFN0YXJF bmNsb3N1cmUpOgorICAgICAgICAoSlNDOjpZYXJyOjpZYXJyR2VuZXJhdG9yOjpjb21waWxlKToK KyAgICAgICAgKiB5YXJyL1lhcnJQYXR0ZXJuLmNwcDoKKyAgICAgICAgKEpTQzo6WWFycjo6WWFy clBhdHRlcm46OllhcnJQYXR0ZXJuKToKKyAgICAgICAgKiB5YXJyL1lhcnJQYXR0ZXJuLmg6Cisg ICAgICAgIChKU0M6OllhcnI6OllhcnJQYXR0ZXJuOjpyZXNldCk6CisKIDIwMTctMDYtMjggIERl dmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IEluc3RydW1lbnQgYWN0aXZlIHBpeGVsIG1lbW9yeSB1c2VkIGJ5IGNhbnZhc2VzCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3lhcnIvWWFyci5oCShyZXZpc2lvbiAyMTg5MzIpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUveWFyci9ZYXJyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAg bmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBZYXJyIHsKICNkZWZpbmUgWWFyclN0YWNrU3BhY2VG b3JCYWNrVHJhY2tJbmZvUGFyZW50aGVzZXNPbmNlIDEgLy8gT25seSBmb3IgIWZpeGVkIHF1YW50 aWZpZXJzLgogI2RlZmluZSBZYXJyU3RhY2tTcGFjZUZvckJhY2tUcmFja0luZm9QYXJlbnRoZXNl c1Rlcm1pbmFsIDEKICNkZWZpbmUgWWFyclN0YWNrU3BhY2VGb3JCYWNrVHJhY2tJbmZvUGFyZW50 aGVzZXMgMgorI2RlZmluZSBZYXJyU3RhY2tTcGFjZUZvckRvdFN0YXJFbmNsb3N1cmUgMQogCiBz dGF0aWMgY29uc3QgdW5zaWduZWQgcXVhbnRpZnlJbmZpbml0ZSA9IFVJTlRfTUFYOwogc3RhdGlj IGNvbnN0IHVuc2lnbmVkIG9mZnNldE5vTWF0Y2ggPSBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2ln bmVkPjo6bWF4KCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySW50ZXJw cmV0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJJ bnRlcnByZXRlci5jcHAJKHJldmlzaW9uIDIxODkzMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS95YXJyL1lhcnJJbnRlcnByZXRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNDYsMTQgKzEx NDYsMTQgQEAgcHVibGljOgogICAgICAgICBVTlVTRURfUEFSQU0odGVybSk7CiAgICAgICAgIHVu c2lnbmVkIG1hdGNoQmVnaW4gPSBjb250ZXh0LT5tYXRjaEJlZ2luOwogCi0gICAgICAgIGlmICht YXRjaEJlZ2luKSB7CisgICAgICAgIGlmIChtYXRjaEJlZ2luID4gc3RhcnRPZmZzZXQpIHsKICAg ICAgICAgICAgIGZvciAobWF0Y2hCZWdpbi0tOyB0cnVlOyBtYXRjaEJlZ2luLS0pIHsKICAgICAg ICAgICAgICAgICBpZiAodGVzdENoYXJhY3RlckNsYXNzKHBhdHRlcm4tPm5ld2xpbmVDaGFyYWN0 ZXJDbGFzcywgaW5wdXQucmVyZWFkKG1hdGNoQmVnaW4pKSkgewogICAgICAgICAgICAgICAgICAg ICArK21hdGNoQmVnaW47CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgICAgIGlmICghbWF0Y2hCZWdpbikKKyAgICAgICAgICAgICAg ICBpZiAobWF0Y2hCZWdpbiA9PSBzdGFydE9mZnNldCkKICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE1NjYsNiArMTU2Niw3IEBAIHB1Ymxp YzoKICAgICAgICAgLCBvdXRwdXQob3V0cHV0KQogICAgICAgICAsIGlucHV0KGlucHV0LCBzdGFy dCwgbGVuZ3RoLCBwYXR0ZXJuLT51bmljb2RlKCkpCiAgICAgICAgICwgYWxsb2NhdG9yUG9vbCgw KQorICAgICAgICAsIHN0YXJ0T2Zmc2V0KHN0YXJ0KQogICAgICAgICAsIHJlbWFpbmluZ01hdGNo Q291bnQobWF0Y2hMaW1pdCkKICAgICB7CiAgICAgfQpAQCAtMTU3Niw2ICsxNTc3LDcgQEAgcHJp dmF0ZToKICAgICB1bnNpZ25lZCogb3V0cHV0OwogICAgIElucHV0U3RyZWFtIGlucHV0OwogICAg IEJ1bXBQb2ludGVyUG9vbCogYWxsb2NhdG9yUG9vbDsKKyAgICB1bnNpZ25lZCBzdGFydE9mZnNl dDsKICAgICB1bnNpZ25lZCByZW1haW5pbmdNYXRjaENvdW50OwogfTsKIApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAJKHJldmlzaW9uIDIxODkzMikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2 ICs1Miw5IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgOiBwcml2YXRlIE1hY3JvQXNzZW0KICAgICBz dGF0aWMgY29uc3QgUmVnaXN0ZXJJRCByZWdUMCA9IEFSTVJlZ2lzdGVyczo6cjQ7CiAgICAgc3Rh dGljIGNvbnN0IFJlZ2lzdGVySUQgcmVnVDEgPSBBUk1SZWdpc3RlcnM6OnI1OwogCisgICAgc3Rh dGljIGNvbnN0IFJlZ2lzdGVySUQgaW5pdGlhbFN0YXJ0ID0gQVJNUmVnaXN0ZXJzOjpyNjsKKyNk ZWZpbmUgSEFWRV9JTklUSUFMX1NUQVJUX1JFRworCiAgICAgc3RhdGljIGNvbnN0IFJlZ2lzdGVy SUQgcmV0dXJuUmVnaXN0ZXIgPSBBUk1SZWdpc3RlcnM6OnIwOwogICAgIHN0YXRpYyBjb25zdCBS ZWdpc3RlcklEIHJldHVyblJlZ2lzdGVyMiA9IEFSTVJlZ2lzdGVyczo6cjE7CiAjZWxpZiBDUFUo QVJNNjQpCkBAIC02Myw2ICs2Niw5IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgOiBwcml2YXRlIE1h Y3JvQXNzZW0KICAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCByZWdUMCA9IEFSTTY0UmVnaXN0 ZXJzOjp4NDsKICAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCByZWdUMSA9IEFSTTY0UmVnaXN0 ZXJzOjp4NTsKIAorICAgIHN0YXRpYyBjb25zdCBSZWdpc3RlcklEIGluaXRpYWxTdGFydCA9IEFS TTY0UmVnaXN0ZXJzOjp4NjsKKyNkZWZpbmUgSEFWRV9JTklUSUFMX1NUQVJUX1JFRworCiAgICAg c3RhdGljIGNvbnN0IFJlZ2lzdGVySUQgcmV0dXJuUmVnaXN0ZXIgPSBBUk02NFJlZ2lzdGVyczo6 eDA7CiAgICAgc3RhdGljIGNvbnN0IFJlZ2lzdGVySUQgcmV0dXJuUmVnaXN0ZXIyID0gQVJNNjRS ZWdpc3RlcnM6OngxOwogI2VsaWYgQ1BVKE1JUFMpCkBAIC03NCw2ICs4MCw5IEBAIGNsYXNzIFlh cnJHZW5lcmF0b3IgOiBwcml2YXRlIE1hY3JvQXNzZW0KICAgICBzdGF0aWMgY29uc3QgUmVnaXN0 ZXJJRCByZWdUMCA9IE1JUFNSZWdpc3RlcnM6OnQ0OwogICAgIHN0YXRpYyBjb25zdCBSZWdpc3Rl cklEIHJlZ1QxID0gTUlQU1JlZ2lzdGVyczo6dDU7CiAKKyAgICBzdGF0aWMgY29uc3QgUmVnaXN0 ZXJJRCBpbml0aWFsU3RhcnQgPSBNSVBTUmVnaXN0ZXJzOjp0NjsKKyNkZWZpbmUgSEFWRV9JTklU SUFMX1NUQVJUX1JFRworCiAgICAgc3RhdGljIGNvbnN0IFJlZ2lzdGVySUQgcmV0dXJuUmVnaXN0 ZXIgPSBNSVBTUmVnaXN0ZXJzOjp2MDsKICAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCByZXR1 cm5SZWdpc3RlcjIgPSBNSVBTUmVnaXN0ZXJzOjp2MTsKICNlbGlmIENQVShYODYpCkBAIC0xMDYs NiArMTE1LDEzIEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgOiBwcml2YXRlIE1hY3JvQXNzZW0KICAg ICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCByZWdUMCA9IFg4NlJlZ2lzdGVyczo6ZWF4OwogICAg IHN0YXRpYyBjb25zdCBSZWdpc3RlcklEIHJlZ1QxID0gWDg2UmVnaXN0ZXJzOjplYng7CiAKKyNp ZiAhT1MoV0lORE9XUykKKyAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBpbml0aWFsU3RhcnQg PSBYODZSZWdpc3RlcnM6OnI4OworI2Vsc2UKKyAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBp bml0aWFsU3RhcnQgPSBYODZSZWdpc3RlcnM6OmVjeDsKKyNlbmRpZgorI2RlZmluZSBIQVZFX0lO SVRJQUxfU1RBUlRfUkVHCisKICAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCByZXR1cm5SZWdp c3RlciA9IFg4NlJlZ2lzdGVyczo6ZWF4OwogICAgIHN0YXRpYyBjb25zdCBSZWdpc3RlcklEIHJl dHVyblJlZ2lzdGVyMiA9IFg4NlJlZ2lzdGVyczo6ZWR4OwogI2VuZGlmCkBAIC0xMTg5LDYgKzEy MDUsOSBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIDogcHJpdmF0ZSBNYWNyb0Fzc2VtCiAKICAgICAg ICAgY29uc3QgUmVnaXN0ZXJJRCBjaGFyYWN0ZXIgPSByZWdUMDsKICAgICAgICAgY29uc3QgUmVn aXN0ZXJJRCBtYXRjaFBvcyA9IHJlZ1QxOworI2lmbmRlZiBIQVZFX0lOSVRJQUxfU1RBUlRfUkVH CisgICAgICAgIGNvbnN0IFJlZ2lzdGVySUQgaW5pdGlhbFN0YXJ0ID0gY2hhcmFjdGVyOworI2Vu ZGlmCiAKICAgICAgICAgSnVtcExpc3QgZm91bmRCZWdpbm5pbmdOZXdMaW5lOwogICAgICAgICBK dW1wTGlzdCBzYXZlU3RhcnRJbmRleDsKQEAgLTExOTcsNyArMTIxNiwxMCBAQCBjbGFzcyBZYXJy R2VuZXJhdG9yIDogcHJpdmF0ZSBNYWNyb0Fzc2VtCiAgICAgICAgIEFTU0VSVCghbV9wYXR0ZXJu Lm1fYm9keS0+bV9oYXNGaXhlZFNpemUpOwogICAgICAgICBnZXRNYXRjaFN0YXJ0KG1hdGNoUG9z KTsKIAotICAgICAgICBzYXZlU3RhcnRJbmRleC5hcHBlbmQoYnJhbmNoVGVzdDMyKFplcm8sIG1h dGNoUG9zKSk7CisjaWZuZGVmIEhBVkVfSU5JVElBTF9TVEFSVF9SRUcKKyAgICAgICAgbG9hZEZy b21GcmFtZShtX3BhdHRlcm4ubV9pbml0aWFsU3RhcnRWYWx1ZUZyYW1lTG9jYXRpb24sIGluaXRp YWxTdGFydCk7CisjZW5kaWYKKyAgICAgICAgc2F2ZVN0YXJ0SW5kZXguYXBwZW5kKGJyYW5jaDMy KEJlbG93T3JFcXVhbCwgbWF0Y2hQb3MsIGluaXRpYWxTdGFydCkpOwogICAgICAgICBMYWJlbCBm aW5kQk9MTG9vcCh0aGlzKTsKICAgICAgICAgc3ViMzIoVHJ1c3RlZEltbTMyKDEpLCBtYXRjaFBv cyk7CiAgICAgICAgIGlmIChtX2NoYXJTaXplID09IENoYXI4KQpAQCAtMTIwNSw3ICsxMjI3LDEx IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgOiBwcml2YXRlIE1hY3JvQXNzZW0KICAgICAgICAgZWxz ZQogICAgICAgICAgICAgbG9hZDE2KEJhc2VJbmRleChpbnB1dCwgbWF0Y2hQb3MsIFRpbWVzVHdv LCAwKSwgY2hhcmFjdGVyKTsKICAgICAgICAgbWF0Y2hDaGFyYWN0ZXJDbGFzcyhjaGFyYWN0ZXIs IGZvdW5kQmVnaW5uaW5nTmV3TGluZSwgbV9wYXR0ZXJuLm5ld2xpbmVDaGFyYWN0ZXJDbGFzcygp KTsKLSAgICAgICAgYnJhbmNoVGVzdDMyKE5vblplcm8sIG1hdGNoUG9zKS5saW5rVG8oZmluZEJP TExvb3AsIHRoaXMpOworCisjaWZuZGVmIEhBVkVfSU5JVElBTF9TVEFSVF9SRUcKKyAgICAgICAg bG9hZEZyb21GcmFtZShtX3BhdHRlcm4ubV9pbml0aWFsU3RhcnRWYWx1ZUZyYW1lTG9jYXRpb24s IGluaXRpYWxTdGFydCk7CisjZW5kaWYKKyAgICAgICAgYnJhbmNoMzIoQWJvdmUsIG1hdGNoUG9z LCBpbml0aWFsU3RhcnQpLmxpbmtUbyhmaW5kQk9MTG9vcCwgdGhpcyk7CiAgICAgICAgIHNhdmVT dGFydEluZGV4LmFwcGVuZChqdW1wKCkpOwogCiAgICAgICAgIGZvdW5kQmVnaW5uaW5nTmV3TGlu ZS5saW5rKHRoaXMpOwpAQCAtMjY2NSw2ICsyNjkxLDE0IEBAIHB1YmxpYzoKIAogICAgICAgICBp bml0Q2FsbEZyYW1lKCk7CiAKKyAgICAgICAgaWYgKG1fcGF0dGVybi5tX3NhdmVJbml0aWFsU3Rh cnRWYWx1ZSkgeworI2lmZGVmIEhBVkVfSU5JVElBTF9TVEFSVF9SRUcKKyAgICAgICAgICAgIG1v dmUoaW5kZXgsIGluaXRpYWxTdGFydCk7CisjZWxzZQorICAgICAgICAgICAgc3RvcmVUb0ZyYW1l KGluZGV4LCBtX3BhdHRlcm4ubV9pbml0aWFsU3RhcnRWYWx1ZUZyYW1lTG9jYXRpb24pOworI2Vu ZGlmCisgICAgICAgIH0KKwogICAgICAgICBvcENvbXBpbGVCb2R5KG1fcGF0dGVybi5tX2JvZHkp OwogCiAgICAgICAgIGlmIChtX3Nob3VsZEZhbGxCYWNrKSB7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUveWFyci9ZYXJyUGF0dGVybi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3lhcnIvWWFyclBhdHRlcm4uY3BwCShyZXZpc2lvbiAyMTg5MzIpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyUGF0dGVybi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTY3NSw4ICs2NzUsMTIgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAg ICAgICAgICBjYXNlIFBhdHRlcm5UZXJtOjpUeXBlRG90U3RhckVuY2xvc3VyZToKKyAgICAgICAg ICAgICAgICBBU1NFUlQoIW1fcGF0dGVybi5tX3NhdmVJbml0aWFsU3RhcnRWYWx1ZSk7CiAgICAg ICAgICAgICAgICAgYWx0ZXJuYXRpdmUtPm1faGFzRml4ZWRTaXplID0gZmFsc2U7CiAgICAgICAg ICAgICAgICAgdGVybS5pbnB1dFBvc2l0aW9uID0gaW5pdGlhbElucHV0UG9zaXRpb247CisgICAg ICAgICAgICAgICAgbV9wYXR0ZXJuLm1faW5pdGlhbFN0YXJ0VmFsdWVGcmFtZUxvY2F0aW9uID0g Y3VycmVudENhbGxGcmFtZVNpemU7CisgICAgICAgICAgICAgICAgY3VycmVudENhbGxGcmFtZVNp emUgKz0gWWFyclN0YWNrU3BhY2VGb3JEb3RTdGFyRW5jbG9zdXJlOworICAgICAgICAgICAgICAg IG1fcGF0dGVybi5tX3NhdmVJbml0aWFsU3RhcnRWYWx1ZSA9IHRydWU7CiAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoY3VycmVudElucHV0UG9z aXRpb24uaGFzT3ZlcmZsb3dlZCgpKQpAQCAtOTYyLDYgKzk2Niw3IEBAIFlhcnJQYXR0ZXJuOjpZ YXJyUGF0dGVybihjb25zdCBTdHJpbmcmIHAKICAgICAsIG1fY29udGFpbnNCT0woZmFsc2UpCiAg ICAgLCBtX2NvbnRhaW5zVW5zaWduZWRMZW5ndGhQYXR0ZXJuKGZhbHNlKQogICAgICwgbV9oYXND b3BpZWRQYXJlblN1YmV4cHJlc3Npb25zKGZhbHNlKQorICAgICwgbV9zYXZlSW5pdGlhbFN0YXJ0 VmFsdWUoZmFsc2UpCiAgICAgLCBtX2ZsYWdzKGZsYWdzKQogICAgICwgbV9udW1TdWJwYXR0ZXJu cygwKQogICAgICwgbV9tYXhCYWNrUmVmZXJlbmNlKDApCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUveWFyci9ZYXJyUGF0dGVybi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS95YXJyL1lhcnJQYXR0ZXJuLmgJKHJldmlzaW9uIDIxODkzMikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS95YXJyL1lhcnJQYXR0ZXJuLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0MywxMSAr MzQzLDEzIEBAIHN0cnVjdCBZYXJyUGF0dGVybiB7CiAgICAgewogICAgICAgICBtX251bVN1YnBh dHRlcm5zID0gMDsKICAgICAgICAgbV9tYXhCYWNrUmVmZXJlbmNlID0gMDsKKyAgICAgICAgbV9p bml0aWFsU3RhcnRWYWx1ZUZyYW1lTG9jYXRpb24gPSAwOwogCiAgICAgICAgIG1fY29udGFpbnNC YWNrcmVmZXJlbmNlcyA9IGZhbHNlOwogICAgICAgICBtX2NvbnRhaW5zQk9MID0gZmFsc2U7CiAg ICAgICAgIG1fY29udGFpbnNVbnNpZ25lZExlbmd0aFBhdHRlcm4gPSBmYWxzZTsKICAgICAgICAg bV9oYXNDb3BpZWRQYXJlblN1YmV4cHJlc3Npb25zID0gZmFsc2U7CisgICAgICAgIG1fc2F2ZUlu aXRpYWxTdGFydFZhbHVlID0gZmFsc2U7CiAKICAgICAgICAgbmV3bGluZUNhY2hlZCA9IDA7CiAg ICAgICAgIGRpZ2l0c0NhY2hlZCA9IDA7CkBAIC00NTUsOSArNDU3LDExIEBAIHN0cnVjdCBZYXJy UGF0dGVybiB7CiAgICAgYm9vbCBtX2NvbnRhaW5zQk9MIDogMTsKICAgICBib29sIG1fY29udGFp bnNVbnNpZ25lZExlbmd0aFBhdHRlcm4gOiAxOwogICAgIGJvb2wgbV9oYXNDb3BpZWRQYXJlblN1 YmV4cHJlc3Npb25zIDogMTsKKyAgICBib29sIG1fc2F2ZUluaXRpYWxTdGFydFZhbHVlIDogMTsK ICAgICBSZWdFeHBGbGFncyBtX2ZsYWdzOwogICAgIHVuc2lnbmVkIG1fbnVtU3VicGF0dGVybnM7 CiAgICAgdW5zaWduZWQgbV9tYXhCYWNrUmVmZXJlbmNlOworICAgIHVuc2lnbmVkIG1faW5pdGlh bFN0YXJ0VmFsdWVGcmFtZUxvY2F0aW9uOwogICAgIFBhdHRlcm5EaXNqdW5jdGlvbiogbV9ib2R5 OwogICAgIFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8UGF0dGVybkRpc2p1bmN0aW9uPiwgND4gbV9k aXNqdW5jdGlvbnM7CiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDaGFyYWN0ZXJDbGFzcz4+ IG1fdXNlckNoYXJhY3RlckNsYXNzZXM7Cg==