71532 2011-11-03 18:56:39 -0700 "use strict" can not contain escape sequences or line continuation 2011-11-07 18:25:39 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ariya.hidayat ariya.hidayat oldest_to_newest 495992 0 ariya.hidayat 2011-11-03 18:56:39 -0700 "use strict" should not be recognized if it contains escape sequences or line continuation. For example, the following should not trigger strict mode: "use stri\ ct" 495996 1 113607 ariya.hidayat 2011-11-03 19:04:50 -0700 Created attachment 113607 patch 496267 2 113607 darin 2011-11-04 10:18:09 -0700 Comment on attachment 113607 patch View in context: https://bugs.webkit.org/attachment.cgi?id=113607&action=review > Source/JavaScriptCore/parser/Parser.cpp:144 > + if (!hasSetStrict && directiveLiteralLength == 12 && m_globalData->propertyNames->useStrictIdentifier == *directive) { This hardcoded 12 is not good. Can we put a named constant at the start of the file? > Source/JavaScriptCore/parser/Parser.cpp:653 > +template <class TreeBuilder> TreeStatement Parser::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned *directiveLiteralLength) misplaced * here 496280 3 ariya.hidayat 2011-11-04 10:37:50 -0700 > This hardcoded 12 is not good. Can we put a named constant at the start of the file? What do you think of const in the function? It's closer and easier to discover. > misplaced * here Noted. On the second thought, I also want to update to include escape sequence in the test (the patch only tests line continuation). 496296 4 113680 ariya.hidayat 2011-11-04 10:53:17 -0700 Created attachment 113680 updated patch 497656 5 113680 ariya.hidayat 2011-11-07 18:25:36 -0800 Comment on attachment 113680 updated patch Clearing flags on attachment: 113680 Committed r99513: <http://trac.webkit.org/changeset/99513> 497657 6 ariya.hidayat 2011-11-07 18:25:39 -0800 All reviewed patches have been landed. Closing bug. 113607 2011-11-03 19:04:50 -0700 2011-11-04 10:53:17 -0700 patch use-strict-literal.patch text/plain 6538 ariya.hidayat ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjMzMwOTQ0Li5lOWU0NTY4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEt MDMgIEFyaXlhIEhpZGF5YXQgIDxhcml5YUBzZW5jaGEuY29tPgorCisgICAgICAgICJ1c2Ugc3Ry aWN0IiBjYW4gbm90IGNvbnRhaW4gZXNjYXBlIHNlcXVlbmNlcyBvciBsaW5lIGNvbnRpbnVhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1MzIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qv anMvYmFzaWMtc3RyaWN0LW1vZGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvanMvc2Ny aXB0LXRlc3RzL2Jhc2ljLXN0cmljdC1tb2RlLmpzOgorICAgICAgICAodGVzdFRoaXMyKToKKwog MjAxMS0xMS0wMyAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl bW92ZSBhbiBvYnNvbGV0ZSBjb21tZW50LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9q cy9iYXNpYy1zdHJpY3QtbW9kZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL2Jh c2ljLXN0cmljdC1tb2RlLWV4cGVjdGVkLnR4dAppbmRleCAyNzgxY2RkLi5lYThiODljIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2pzL2Jhc2ljLXN0cmljdC1tb2RlLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL2Jhc2ljLXN0cmljdC1tb2RlLWV4cGVjdGVkLnR4 dApAQCAtOCw2ICs4LDcgQEAgUEFTUyB0ZXN0VGhpcy5jYWxsKDEpIGlzIDEKIFBBU1MgdGVzdFRo aXMuY2FsbCh0cnVlKSBpcyB0cnVlCiBQQVNTIHRlc3RUaGlzLmNhbGwoZmFsc2UpIGlzIGZhbHNl CiBQQVNTIHRlc3RUaGlzLmNhbGwodW5kZWZpbmVkKSBpcyB1bmRlZmluZWQKK1BBU1MgdGVzdFRo aXMyLmNhbGwodW5kZWZpbmVkKSA9PT0gdW5kZWZpbmVkIGlzIGZhbHNlCiBQQVNTIHRlc3RUaGlz LmNhbGwoJ2Egc3RyaW5nJykgaXMgJ2Egc3RyaW5nJwogUEFTUyB0ZXN0VGhpc0RvdEFjY2Vzcy5j YWxsKCdhIHN0cmluZycpIGlzICdhIHN0cmluZycubGVuZ3RoCiBQQVNTIHRlc3RUaGlzRG90QWNj ZXNzLmNhbGwobnVsbCkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogJ251bGwnIGlzIG5vdCBh biBvYmplY3QgKGV2YWx1YXRpbmcgJ3RoaXMubGVuZ3RoJykuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2pzL3NjcmlwdC10ZXN0cy9iYXNpYy1zdHJpY3QtbW9kZS5qcyBiL0xheW91dFRl c3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL2Jhc2ljLXN0cmljdC1tb2RlLmpzCmluZGV4IGZmNmEw MGUuLmZkOGE0NmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3Rz L2Jhc2ljLXN0cmljdC1tb2RlLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRl c3RzL2Jhc2ljLXN0cmljdC1tb2RlLmpzCkBAIC0yMCwxMiArMjAsMTggQEAgZnVuY3Rpb24gc2hv dWxkQmVTeW50YXhFcnJvcihzdHIpIHsKICAgICBzaG91bGRUaHJvdyhzdHIpOwogICAgIHNob3Vs ZFRocm93KCIoZnVuY3Rpb24oKXsiICsgc3RyICsgIn0pIik7CiB9CitmdW5jdGlvbiB0ZXN0VGhp czIoKSB7CisgICAgInVzZSBzdHJpY1wKK3QiOworICAgIHJldHVybiB0aGlzOworfQogCiBzaG91 bGRCZSgidGVzdFRoaXMuY2FsbChudWxsKSIsICJudWxsIik7CiBzaG91bGRCZSgidGVzdFRoaXMu Y2FsbCgxKSIsICIxIik7CiBzaG91bGRCZSgidGVzdFRoaXMuY2FsbCh0cnVlKSIsICJ0cnVlIik7 CiBzaG91bGRCZSgidGVzdFRoaXMuY2FsbChmYWxzZSkiLCAiZmFsc2UiKTsKIHNob3VsZEJlKCJ0 ZXN0VGhpcy5jYWxsKHVuZGVmaW5lZCkiLCAidW5kZWZpbmVkIik7CitzaG91bGRCZUZhbHNlKCJ0 ZXN0VGhpczIuY2FsbCh1bmRlZmluZWQpID09PSB1bmRlZmluZWQiKTsKIHNob3VsZEJlKCJ0ZXN0 VGhpcy5jYWxsKCdhIHN0cmluZycpIiwgIidhIHN0cmluZyciKTsKIHNob3VsZEJlKCJ0ZXN0VGhp c0RvdEFjY2Vzcy5jYWxsKCdhIHN0cmluZycpIiwgIidhIHN0cmluZycubGVuZ3RoIik7CiBzaG91 bGRUaHJvdygidGVzdFRoaXNEb3RBY2Nlc3MuY2FsbChudWxsKSIpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKaW5kZXggNDQzODRjYi4uMmFhNzI0MiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTEtMTEtMDMgIEFyaXlhIEhpZGF5YXQgIDxhcml5YUBzZW5jaGEu Y29tPgorCisgICAgICAgICJ1c2Ugc3RyaWN0IiBjYW4gbm90IGNvbnRhaW4gZXNjYXBlIHNlcXVl bmNlcyBvciBsaW5lIGNvbnRpbnVhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzE1MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTdG9yZSB0aGUgYWN0dWFsIGxpdGVyYWwgbGVuZ3RoIChiZWZvcmUg dGhlIGVzY2FwZXMgYW5kIGxpbmUKKyAgICAgICAgY29udGludWF0aW9uIGFyZSBlbmNvZGVkKSB3 aGlsZSBwYXJzaW5nIHRoZSBkaXJlY3RpdmUgYW5kIHVzZSBpdAorICAgICAgICBmb3IgdGhlIGRp cmVjdGl2ZSBjb21wYXJpc29uLgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6CisgICAg ICAgIChKU0M6OlBhcnNlcjo6cGFyc2VTb3VyY2VFbGVtZW50cyk6CisgICAgICAgIChKU0M6OlBh cnNlcjo6cGFyc2VTdGF0ZW1lbnQpOgorICAgICAgICAqIHBhcnNlci9QYXJzZXIuaDoKKwogMjAx MS0xMS0wMyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hhbmdl IHJlbWFpbmluZyBjYWxsZXJzIG9mIHJlbGVhc2VSZWYgdG8gY2FsbCBsZWFrUmVmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKaW5kZXggMjRjODczZS4uM2I3MjhmYyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcApAQCAtMTMyLDE0ICsxMzIsMTYg QEAgdGVtcGxhdGUgPFBhcnNlcjo6U291cmNlRWxlbWVudHNNb2RlIG1vZGUsIGNsYXNzIFRyZWVC dWlsZGVyPiBUcmVlU291cmNlRWxlbWVudHMKICAgICBUcmVlU291cmNlRWxlbWVudHMgc291cmNl RWxlbWVudHMgPSBjb250ZXh0LmNyZWF0ZVNvdXJjZUVsZW1lbnRzKCk7CiAgICAgYm9vbCBzZWVu Tm9uRGlyZWN0aXZlID0gZmFsc2U7CiAgICAgY29uc3QgSWRlbnRpZmllciogZGlyZWN0aXZlID0g MDsKKyAgICB1bnNpZ25lZCBkaXJlY3RpdmVMaXRlcmFsTGVuZ3RoID0gMDsKICAgICB1bnNpZ25l ZCBzdGFydE9mZnNldCA9IG1fdG9rZW4ubV9pbmZvLnN0YXJ0T2Zmc2V0OwogICAgIHVuc2lnbmVk IG9sZExhc3RMaW5lTnVtYmVyID0gbV9sZXhlci0+bGFzdExpbmVOdW1iZXIoKTsKICAgICB1bnNp Z25lZCBvbGRMaW5lTnVtYmVyID0gbV9sZXhlci0+bGluZU51bWJlcigpOwogICAgIGJvb2wgaGFz U2V0U3RyaWN0ID0gZmFsc2U7Ci0gICAgd2hpbGUgKFRyZWVTdGF0ZW1lbnQgc3RhdGVtZW50ID0g cGFyc2VTdGF0ZW1lbnQoY29udGV4dCwgZGlyZWN0aXZlKSkgeworICAgIHdoaWxlIChUcmVlU3Rh dGVtZW50IHN0YXRlbWVudCA9IHBhcnNlU3RhdGVtZW50KGNvbnRleHQsIGRpcmVjdGl2ZSwgJmRp cmVjdGl2ZUxpdGVyYWxMZW5ndGgpKSB7CiAgICAgICAgIGlmIChtb2RlID09IENoZWNrRm9yU3Ry aWN0TW9kZSAmJiAhc2Vlbk5vbkRpcmVjdGl2ZSkgewogICAgICAgICAgICAgaWYgKGRpcmVjdGl2 ZSkgewotICAgICAgICAgICAgICAgIGlmICghaGFzU2V0U3RyaWN0ICYmIG1fZ2xvYmFsRGF0YS0+ cHJvcGVydHlOYW1lcy0+dXNlU3RyaWN0SWRlbnRpZmllciA9PSAqZGlyZWN0aXZlKSB7CisgICAg ICAgICAgICAgICAgLy8gInVzZSBzdHJpY3QiIG11c3QgYmUgdGhlIGV4YWN0IGxpdGVyYWwgd2l0 aG91dCBlc2NhcGUgc2VxdWVuY2VzIG9yIGxpbmUgY29udGludWF0aW9uLgorICAgICAgICAgICAg ICAgIGlmICghaGFzU2V0U3RyaWN0ICYmIGRpcmVjdGl2ZUxpdGVyYWxMZW5ndGggPT0gMTIgJiYg bV9nbG9iYWxEYXRhLT5wcm9wZXJ0eU5hbWVzLT51c2VTdHJpY3RJZGVudGlmaWVyID09ICpkaXJl Y3RpdmUpIHsKICAgICAgICAgICAgICAgICAgICAgc2V0U3RyaWN0TW9kZSgpOwogICAgICAgICAg ICAgICAgICAgICBoYXNTZXRTdHJpY3QgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICBmYWls SWZGYWxzZShpc1ZhbGlkU3RyaWN0TW9kZSgpKTsKQEAgLTY0OCw3ICs2NTAsNyBAQCB0ZW1wbGF0 ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgUGFyc2VyOjpwYXJzZUJsb2NrU3Rh dGVtZW50KFRyZWVCdWlsZAogICAgIHJldHVybiBjb250ZXh0LmNyZWF0ZUJsb2NrU3RhdGVtZW50 KG1fbGV4ZXItPmxhc3RMaW5lTnVtYmVyKCksIHN1YnRyZWUsIHN0YXJ0LCBtX2xhc3RMaW5lKTsK IH0KIAotdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IFBhcnNlcjo6 cGFyc2VTdGF0ZW1lbnQoVHJlZUJ1aWxkZXImIGNvbnRleHQsIGNvbnN0IElkZW50aWZpZXIqJiBk aXJlY3RpdmUpCit0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgUGFy c2VyOjpwYXJzZVN0YXRlbWVudChUcmVlQnVpbGRlciYgY29udGV4dCwgY29uc3QgSWRlbnRpZmll ciomIGRpcmVjdGl2ZSwgdW5zaWduZWQgKmRpcmVjdGl2ZUxpdGVyYWxMZW5ndGgpCiB7CiAgICAg RGVwdGhNYW5hZ2VyIHN0YXRlbWVudERlcHRoKCZtX3N0YXRlbWVudERlcHRoKTsKICAgICBtX3N0 YXRlbWVudERlcHRoKys7CkBAIC03MDIsNiArNzA0LDggQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVC dWlsZGVyPiBUcmVlU3RhdGVtZW50IFBhcnNlcjo6cGFyc2VTdGF0ZW1lbnQoVHJlZUJ1aWxkZXIm IGMKICAgICAgICAgcmV0dXJuIHBhcnNlRXhwcmVzc2lvbk9yTGFiZWxTdGF0ZW1lbnQoY29udGV4 dCk7CiAgICAgY2FzZSBTVFJJTkc6CiAgICAgICAgIGRpcmVjdGl2ZSA9IG1fdG9rZW4ubV9kYXRh LmlkZW50OworICAgICAgICBpZiAoZGlyZWN0aXZlTGl0ZXJhbExlbmd0aCkKKyAgICAgICAgICAg ICpkaXJlY3RpdmVMaXRlcmFsTGVuZ3RoID0gbV90b2tlbi5tX2luZm8uZW5kT2Zmc2V0IC0gbV90 b2tlbi5tX2luZm8uc3RhcnRPZmZzZXQ7CiAgICAgICAgIG5vblRyaXZpYWxFeHByZXNzaW9uQ291 bnQgPSBtX25vblRyaXZpYWxFeHByZXNzaW9uQ291bnQ7CiAgICAgZGVmYXVsdDoKICAgICAgICAg VHJlZVN0YXRlbWVudCBleHByU3RhdGVtZW50ID0gcGFyc2VFeHByZXNzaW9uU3RhdGVtZW50KGNv bnRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKaW5kZXggZDRhNzFlMi4u ZmM2ODRmNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIu aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5oCkBAIC04NTYsNyAr ODU2LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICBlbnVtIFNvdXJjZUVsZW1lbnRzTW9kZSB7IENo ZWNrRm9yU3RyaWN0TW9kZSwgRG9udENoZWNrRm9yU3RyaWN0TW9kZSB9OwogICAgIHRlbXBsYXRl IDxTb3VyY2VFbGVtZW50c01vZGUgbW9kZSwgY2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTb3VyY2VF bGVtZW50cyBwYXJzZVNvdXJjZUVsZW1lbnRzKFRyZWVCdWlsZGVyJik7Ci0gICAgdGVtcGxhdGUg PGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IHBhcnNlU3RhdGVtZW50KFRyZWVCdWls ZGVyJiwgY29uc3QgSWRlbnRpZmllciomIGRpcmVjdGl2ZSk7CisgICAgdGVtcGxhdGUgPGNsYXNz IFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IHBhcnNlU3RhdGVtZW50KFRyZWVCdWlsZGVyJiwg Y29uc3QgSWRlbnRpZmllciomIGRpcmVjdGl2ZSwgdW5zaWduZWQqIGRpcmVjdGl2ZUxpdGVyYWxM ZW5ndGggPSAwKTsKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1l bnQgcGFyc2VGdW5jdGlvbkRlY2xhcmF0aW9uKFRyZWVCdWlsZGVyJik7CiAgICAgdGVtcGxhdGUg PGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IHBhcnNlVmFyRGVjbGFyYXRpb24oVHJl ZUJ1aWxkZXImKTsKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1l bnQgcGFyc2VDb25zdERlY2xhcmF0aW9uKFRyZWVCdWlsZGVyJik7Cg== 113680 2011-11-04 10:53:17 -0700 2011-11-07 18:25:36 -0800 updated patch use-strict-literal.patch text/plain 7027 ariya.hidayat ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjMzMwOTQ0Li4yZDhkMzRiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMTEt MDQgIEFyaXlhIEhpZGF5YXQgIDxhcml5YUBzZW5jaGEuY29tPgorCisgICAgICAgICJ1c2Ugc3Ry aWN0IiBjYW4gbm90IGNvbnRhaW4gZXNjYXBlIHNlcXVlbmNlcyBvciBsaW5lIGNvbnRpbnVhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1MzIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qv anMvYmFzaWMtc3RyaWN0LW1vZGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvanMvc2Ny aXB0LXRlc3RzL2Jhc2ljLXN0cmljdC1tb2RlLmpzOgorICAgICAgICAodGVzdExpbmVDb250aW51 YXRpb24pOiBBZGRlZC4KKyAgICAgICAgKHRlc3RFc2NhcGVTZXF1ZW5jZSk6IEFkZGVkLgorCiAy MDExLTExLTAzICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVt b3ZlIGFuIG9ic29sZXRlIGNvbW1lbnQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pz L2Jhc2ljLXN0cmljdC1tb2RlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvanMvYmFz aWMtc3RyaWN0LW1vZGUtZXhwZWN0ZWQudHh0CmluZGV4IDI3ODFjZGQuLmZiMTUxN2IgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvanMvYmFzaWMtc3RyaWN0LW1vZGUtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMvYmFzaWMtc3RyaWN0LW1vZGUtZXhwZWN0ZWQudHh0 CkBAIC04LDYgKzgsOCBAQCBQQVNTIHRlc3RUaGlzLmNhbGwoMSkgaXMgMQogUEFTUyB0ZXN0VGhp cy5jYWxsKHRydWUpIGlzIHRydWUKIFBBU1MgdGVzdFRoaXMuY2FsbChmYWxzZSkgaXMgZmFsc2UK IFBBU1MgdGVzdFRoaXMuY2FsbCh1bmRlZmluZWQpIGlzIHVuZGVmaW5lZAorUEFTUyB0ZXN0TGlu ZUNvbnRpbnVhdGlvbi5jYWxsKHVuZGVmaW5lZCkgPT09IHVuZGVmaW5lZCBpcyBmYWxzZQorUEFT UyB0ZXN0RXNjYXBlU2VxdWVuY2UuY2FsbCh1bmRlZmluZWQpID09PSB1bmRlZmluZWQgaXMgZmFs c2UKIFBBU1MgdGVzdFRoaXMuY2FsbCgnYSBzdHJpbmcnKSBpcyAnYSBzdHJpbmcnCiBQQVNTIHRl c3RUaGlzRG90QWNjZXNzLmNhbGwoJ2Egc3RyaW5nJykgaXMgJ2Egc3RyaW5nJy5sZW5ndGgKIFBB U1MgdGVzdFRoaXNEb3RBY2Nlc3MuY2FsbChudWxsKSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9y OiAnbnVsbCcgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAndGhpcy5sZW5ndGgnKS4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL2Jhc2ljLXN0cmljdC1t b2RlLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvYmFzaWMtc3RyaWN0LW1v ZGUuanMKaW5kZXggZmY2YTAwZS4uOGViMGJmNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFz dC9qcy9zY3JpcHQtdGVzdHMvYmFzaWMtc3RyaWN0LW1vZGUuanMKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9qcy9zY3JpcHQtdGVzdHMvYmFzaWMtc3RyaWN0LW1vZGUuanMKQEAgLTIwLDEyICsyMCwy MyBAQCBmdW5jdGlvbiBzaG91bGRCZVN5bnRheEVycm9yKHN0cikgewogICAgIHNob3VsZFRocm93 KHN0cik7CiAgICAgc2hvdWxkVGhyb3coIihmdW5jdGlvbigpeyIgKyBzdHIgKyAifSkiKTsKIH0K K2Z1bmN0aW9uIHRlc3RMaW5lQ29udGludWF0aW9uKCkgeworICAgICJ1c2Ugc3RyaWNcCit0IjsK KyAgICByZXR1cm4gdGhpczsKK30KK2Z1bmN0aW9uIHRlc3RFc2NhcGVTZXF1ZW5jZSgpIHsKKyAg ICAidXNlXHUwMDIwc3RyaWN0IjsKKyAgICByZXR1cm4gdGhpczsKK30KCiBzaG91bGRCZSgidGVz dFRoaXMuY2FsbChudWxsKSIsICJudWxsIik7CiBzaG91bGRCZSgidGVzdFRoaXMuY2FsbCgxKSIs ICIxIik7CiBzaG91bGRCZSgidGVzdFRoaXMuY2FsbCh0cnVlKSIsICJ0cnVlIik7CiBzaG91bGRC ZSgidGVzdFRoaXMuY2FsbChmYWxzZSkiLCAiZmFsc2UiKTsKIHNob3VsZEJlKCJ0ZXN0VGhpcy5j YWxsKHVuZGVmaW5lZCkiLCAidW5kZWZpbmVkIik7CitzaG91bGRCZUZhbHNlKCJ0ZXN0TGluZUNv bnRpbnVhdGlvbi5jYWxsKHVuZGVmaW5lZCkgPT09IHVuZGVmaW5lZCIpOworc2hvdWxkQmVGYWxz ZSgidGVzdEVzY2FwZVNlcXVlbmNlLmNhbGwodW5kZWZpbmVkKSA9PT0gdW5kZWZpbmVkIik7CiBz aG91bGRCZSgidGVzdFRoaXMuY2FsbCgnYSBzdHJpbmcnKSIsICInYSBzdHJpbmcnIik7CiBzaG91 bGRCZSgidGVzdFRoaXNEb3RBY2Nlc3MuY2FsbCgnYSBzdHJpbmcnKSIsICInYSBzdHJpbmcnLmxl bmd0aCIpOwogc2hvdWxkVGhyb3coInRlc3RUaGlzRG90QWNjZXNzLmNhbGwobnVsbCkiKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQ0Mzg0Y2IuLjA2NTk5YzYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTA0ICBBcml5YSBIaWRheWF0ICA8 YXJpeWFAc2VuY2hhLmNvbT4KKworICAgICAgICAidXNlIHN0cmljdCIgY2FuIG5vdCBjb250YWlu IGVzY2FwZSBzZXF1ZW5jZXMgb3IgbGluZSBjb250aW51YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxNTMyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcmUgdGhlIGFjdHVhbCBsaXRlcmFsIGxl bmd0aCAoYmVmb3JlIHRoZSBlc2NhcGVzIGFuZCBsaW5lCisgICAgICAgIGNvbnRpbnVhdGlvbiBh cmUgZW5jb2RlZCkgd2hpbGUgcGFyc2luZyB0aGUgZGlyZWN0aXZlIGFuZCB1c2UgaXQKKyAgICAg ICAgZm9yIHRoZSBkaXJlY3RpdmUgY29tcGFyaXNvbi4KKworICAgICAgICAqIHBhcnNlci9QYXJz ZXIuY3BwOgorICAgICAgICAoSlNDOjpQYXJzZXI6OnBhcnNlU291cmNlRWxlbWVudHMpOgorICAg ICAgICAoSlNDOjpQYXJzZXI6OnBhcnNlU3RhdGVtZW50KToKKyAgICAgICAgKiBwYXJzZXIvUGFy c2VyLmg6CisKIDIwMTEtMTEtMDMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIENoYW5nZSByZW1haW5pbmcgY2FsbGVycyBvZiByZWxlYXNlUmVmIHRvIGNhbGwgbGVh a1JlZgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IDI0Yzg3M2Uu LmUyOGE4NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2Vy LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKQEAgLTEy OSwxNyArMTI5LDIwIEBAIGJvb2wgUGFyc2VyOjphbGxvd0F1dG9tYXRpY1NlbWljb2xvbigpCiAK IHRlbXBsYXRlIDxQYXJzZXI6OlNvdXJjZUVsZW1lbnRzTW9kZSBtb2RlLCBjbGFzcyBUcmVlQnVp bGRlcj4gVHJlZVNvdXJjZUVsZW1lbnRzIFBhcnNlcjo6cGFyc2VTb3VyY2VFbGVtZW50cyhUcmVl QnVpbGRlciYgY29udGV4dCkKIHsKKyAgICBjb25zdCB1bnNpZ25lZCBsZW5ndGhPZlVzZVN0cmlj dExpdGVyYWwgPSAxMjsgLy8gInVzZSBzdHJpY3QiLmxlbmd0aAogICAgIFRyZWVTb3VyY2VFbGVt ZW50cyBzb3VyY2VFbGVtZW50cyA9IGNvbnRleHQuY3JlYXRlU291cmNlRWxlbWVudHMoKTsKICAg ICBib29sIHNlZW5Ob25EaXJlY3RpdmUgPSBmYWxzZTsKICAgICBjb25zdCBJZGVudGlmaWVyKiBk aXJlY3RpdmUgPSAwOworICAgIHVuc2lnbmVkIGRpcmVjdGl2ZUxpdGVyYWxMZW5ndGggPSAwOwog ICAgIHVuc2lnbmVkIHN0YXJ0T2Zmc2V0ID0gbV90b2tlbi5tX2luZm8uc3RhcnRPZmZzZXQ7CiAg ICAgdW5zaWduZWQgb2xkTGFzdExpbmVOdW1iZXIgPSBtX2xleGVyLT5sYXN0TGluZU51bWJlcigp OwogICAgIHVuc2lnbmVkIG9sZExpbmVOdW1iZXIgPSBtX2xleGVyLT5saW5lTnVtYmVyKCk7CiAg ICAgYm9vbCBoYXNTZXRTdHJpY3QgPSBmYWxzZTsKLSAgICB3aGlsZSAoVHJlZVN0YXRlbWVudCBz dGF0ZW1lbnQgPSBwYXJzZVN0YXRlbWVudChjb250ZXh0LCBkaXJlY3RpdmUpKSB7CisgICAgd2hp bGUgKFRyZWVTdGF0ZW1lbnQgc3RhdGVtZW50ID0gcGFyc2VTdGF0ZW1lbnQoY29udGV4dCwgZGly ZWN0aXZlLCAmZGlyZWN0aXZlTGl0ZXJhbExlbmd0aCkpIHsKICAgICAgICAgaWYgKG1vZGUgPT0g Q2hlY2tGb3JTdHJpY3RNb2RlICYmICFzZWVuTm9uRGlyZWN0aXZlKSB7CiAgICAgICAgICAgICBp ZiAoZGlyZWN0aXZlKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFoYXNTZXRTdHJpY3QgJiYgbV9n bG9iYWxEYXRhLT5wcm9wZXJ0eU5hbWVzLT51c2VTdHJpY3RJZGVudGlmaWVyID09ICpkaXJlY3Rp dmUpIHsKKyAgICAgICAgICAgICAgICAvLyAidXNlIHN0cmljdCIgbXVzdCBiZSB0aGUgZXhhY3Qg bGl0ZXJhbCB3aXRob3V0IGVzY2FwZSBzZXF1ZW5jZXMgb3IgbGluZSBjb250aW51YXRpb24uCisg ICAgICAgICAgICAgICAgaWYgKCFoYXNTZXRTdHJpY3QgJiYgZGlyZWN0aXZlTGl0ZXJhbExlbmd0 aCA9PSBsZW5ndGhPZlVzZVN0cmljdExpdGVyYWwgJiYgbV9nbG9iYWxEYXRhLT5wcm9wZXJ0eU5h bWVzLT51c2VTdHJpY3RJZGVudGlmaWVyID09ICpkaXJlY3RpdmUpIHsKICAgICAgICAgICAgICAg ICAgICAgc2V0U3RyaWN0TW9kZSgpOwogICAgICAgICAgICAgICAgICAgICBoYXNTZXRTdHJpY3Qg PSB0cnVlOwogICAgICAgICAgICAgICAgICAgICBmYWlsSWZGYWxzZShpc1ZhbGlkU3RyaWN0TW9k ZSgpKTsKQEAgLTY0OCw3ICs2NTEsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRy ZWVTdGF0ZW1lbnQgUGFyc2VyOjpwYXJzZUJsb2NrU3RhdGVtZW50KFRyZWVCdWlsZAogICAgIHJl dHVybiBjb250ZXh0LmNyZWF0ZUJsb2NrU3RhdGVtZW50KG1fbGV4ZXItPmxhc3RMaW5lTnVtYmVy KCksIHN1YnRyZWUsIHN0YXJ0LCBtX2xhc3RMaW5lKTsKIH0KIAotdGVtcGxhdGUgPGNsYXNzIFRy ZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IFBhcnNlcjo6cGFyc2VTdGF0ZW1lbnQoVHJlZUJ1aWxk ZXImIGNvbnRleHQsIGNvbnN0IElkZW50aWZpZXIqJiBkaXJlY3RpdmUpCit0ZW1wbGF0ZSA8Y2xh c3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgUGFyc2VyOjpwYXJzZVN0YXRlbWVudChUcmVl QnVpbGRlciYgY29udGV4dCwgY29uc3QgSWRlbnRpZmllciomIGRpcmVjdGl2ZSwgdW5zaWduZWQq IGRpcmVjdGl2ZUxpdGVyYWxMZW5ndGgpCiB7CiAgICAgRGVwdGhNYW5hZ2VyIHN0YXRlbWVudERl cHRoKCZtX3N0YXRlbWVudERlcHRoKTsKICAgICBtX3N0YXRlbWVudERlcHRoKys7CkBAIC03MDIs NiArNzA1LDggQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZW50IFBh cnNlcjo6cGFyc2VTdGF0ZW1lbnQoVHJlZUJ1aWxkZXImIGMKICAgICAgICAgcmV0dXJuIHBhcnNl RXhwcmVzc2lvbk9yTGFiZWxTdGF0ZW1lbnQoY29udGV4dCk7CiAgICAgY2FzZSBTVFJJTkc6CiAg ICAgICAgIGRpcmVjdGl2ZSA9IG1fdG9rZW4ubV9kYXRhLmlkZW50OworICAgICAgICBpZiAoZGly ZWN0aXZlTGl0ZXJhbExlbmd0aCkKKyAgICAgICAgICAgICpkaXJlY3RpdmVMaXRlcmFsTGVuZ3Ro ID0gbV90b2tlbi5tX2luZm8uZW5kT2Zmc2V0IC0gbV90b2tlbi5tX2luZm8uc3RhcnRPZmZzZXQ7 CiAgICAgICAgIG5vblRyaXZpYWxFeHByZXNzaW9uQ291bnQgPSBtX25vblRyaXZpYWxFeHByZXNz aW9uQ291bnQ7CiAgICAgZGVmYXVsdDoKICAgICAgICAgVHJlZVN0YXRlbWVudCBleHByU3RhdGVt ZW50ID0gcGFyc2VFeHByZXNzaW9uU3RhdGVtZW50KGNvbnRleHQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvUGFyc2VyLmgKaW5kZXggZDRhNzFlMi4uZmM2ODRmNCAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL1BhcnNlci5oCkBAIC04NTYsNyArODU2LDcgQEAgcHJpdmF0ZToKICAgICAK ICAgICBlbnVtIFNvdXJjZUVsZW1lbnRzTW9kZSB7IENoZWNrRm9yU3RyaWN0TW9kZSwgRG9udENo ZWNrRm9yU3RyaWN0TW9kZSB9OwogICAgIHRlbXBsYXRlIDxTb3VyY2VFbGVtZW50c01vZGUgbW9k ZSwgY2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTb3VyY2VFbGVtZW50cyBwYXJzZVNvdXJjZUVsZW1l bnRzKFRyZWVCdWlsZGVyJik7Ci0gICAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl U3RhdGVtZW50IHBhcnNlU3RhdGVtZW50KFRyZWVCdWlsZGVyJiwgY29uc3QgSWRlbnRpZmllciom IGRpcmVjdGl2ZSk7CisgICAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVt ZW50IHBhcnNlU3RhdGVtZW50KFRyZWVCdWlsZGVyJiwgY29uc3QgSWRlbnRpZmllciomIGRpcmVj dGl2ZSwgdW5zaWduZWQqIGRpcmVjdGl2ZUxpdGVyYWxMZW5ndGggPSAwKTsKICAgICB0ZW1wbGF0 ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgcGFyc2VGdW5jdGlvbkRlY2xhcmF0 aW9uKFRyZWVCdWlsZGVyJik7CiAgICAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl U3RhdGVtZW50IHBhcnNlVmFyRGVjbGFyYXRpb24oVHJlZUJ1aWxkZXImKTsKICAgICB0ZW1wbGF0 ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgcGFyc2VDb25zdERlY2xhcmF0aW9u KFRyZWVCdWlsZGVyJik7Cg==