148394 2015-08-24 14:26:57 -0700 Add support for setting JSC options from a file. 2015-08-24 14:52:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue oldest_to_newest 1120375 0 mark.lam 2015-08-24 14:26:57 -0700 This is needed for environments where the JSC executable does not have access to environmental variables. This is only needed for debugging, and is currently guarded under a #define USE_OPTIONS_FILE in Options.cpp, and is disabled by default. 1120383 1 259772 mark.lam 2015-08-24 14:36:06 -0700 Created attachment 259772 the fix. 1120388 2 commit-queue 2015-08-24 14:38:32 -0700 Attachment 259772 did not pass style-queue: ERROR: Source/JavaScriptCore/runtime/Options.cpp:443: Use equivelent function in <wtf/ASCIICType.h> instead of the isspace() function. [runtime/ctype_function] [4] ERROR: Source/JavaScriptCore/runtime/Options.cpp:469: Use equivelent function in <wtf/ASCIICType.h> instead of the isspace() function. [runtime/ctype_function] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1120412 3 259780 mark.lam 2015-08-24 14:45:49 -0700 Created attachment 259780 fix 2: use ASCIICType this time. 1120413 4 259780 saam 2015-08-24 14:48:17 -0700 Comment on attachment 259780 fix 2: use ASCIICType this time. r=me 1120416 5 mark.lam 2015-08-24 14:52:40 -0700 Thanks. Landed in r188887: <http://trac.webkit.org/r188887>. 259772 2015-08-24 14:36:06 -0700 2015-08-24 14:45:49 -0700 the fix. bug-148394.patch text/plain 4191 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4ODgwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE1LTA4LTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgc3VwcG9ydCBmb3Igc2V0dGluZyBKU0Mgb3B0aW9ucyBmcm9tIGEgZmlsZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODM5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGZv ciBlbnZpcm9ubWVudHMgd2hlcmUgdGhlIEpTQyBleGVjdXRhYmxlIGRvZXMgbm90IGhhdmUgYWNj ZXNzIHRvCisgICAgICAgIGVudmlyb25tZW50YWwgdmFyaWFibGVzLiAgVGhpcyBpcyBvbmx5IG5l ZWRlZCBmb3IgZGVidWdnaW5nLCBhbmQgaXMgY3VycmVudGx5CisgICAgICAgIGd1YXJkZWQgdW5k ZXIgYSAjZGVmaW5lIFVTRV9PUFRJT05TX0ZJTEUgaW4gT3B0aW9ucy5jcHAsIGFuZCBpcyBkaXNh YmxlZCBieQorICAgICAgICBkZWZhdWx0LgorCisgICAgICAgIEFsc28gZml4ZWQgT3B0aW9uczo6 c2V0T3B0aW9ucygpIHRvIGJlIGFsbG93IGZvciB3aGl0ZXNwYWNlIHRoYXQgaXMgbm90IGEgc2lu Z2xlCisgICAgICAgICcgJy4gIFRoaXMgbWFrZXMgc2V0T3B0aW9ucygpIG11Y2ggbW9yZSBmbGV4 aWJsZSBhbmQgZnJpZW5kbGllciB0byB1c2UgZm9yIGxvYWRpbmcKKyAgICAgICAgb3B0aW9ucyBp biBnZW5lcmFsLgorCisgICAgICAgIEZvciBleGFtcGxlLCB0aGlzIGN1cnJlbnQgdXNlIGNhc2Ug b2YgbG9hZGluZyBvcHRpb25zIGZyb20gYSBmaWxlIG1heSBoYXZlICdcbidzCisgICAgICAgIGlu IHRoZSBjaGFyYWN0ZXIgc3RyZWFtLCBhbmQgdGhpcyBmZWF0dXJlIGlzIGVhc2llciB0byBpbXBs ZW1lbnQgaWYgc2V0T3B0aW9ucygpCisgICAgICAgIGp1c3Qgc3VwcG9ydCBtb3JlIHRoYW4gMSB3 aGl0ZXNwYWNlIGNoYXIgYmV0d2VlbiBvcHRpb25zLCBhbmQgcmVjb2duaXplIHdoaXRlc3BhY2UK KyAgICAgICAgY2hhcmFjdGVycyBvdGhlciB0aGFuICcgJy4KKworICAgICAgICAqIHJ1bnRpbWUv T3B0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OnBhcnNlKToKKyAgICAgICAgKEpTQzo6T3B0aW9u czo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChKU0M6Ok9wdGlvbnM6OnNldE9wdGlvbnMpOgorCiAy MDE1LTA4LTIyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgREZH OjpJbnNlcnRpb25TZXQgc2hvdWxkIGJlIHRvbGVyYW50IG9mIG9jY2FzaW9uYWwgb3V0LW9mLW9y ZGVyIGluc2VydGlvbnMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlv bnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlv bnMuY3BwCShyZXZpc2lvbiAxODg4NzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9PcHRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW5jbHVk ZSAiSGVhcFN0YXRpc3RpY3MuaCIKICNpbmNsdWRlIDxhbGdvcml0aG0+CisjaW5jbHVkZSA8Y2N0 eXBlPgogI2luY2x1ZGUgPGxpbWl0cz4KICNpbmNsdWRlIDxtYXRoLmg+CiAjaW5jbHVkZSA8bXV0 ZXg+CkBAIC00OCw2ICs0OSw5IEBACiAjaW5jbHVkZSAiTWFjcm9Bc3NlbWJsZXJYODYuaCIKICNl bmRpZgogCisjZGVmaW5lIFVTRV9PUFRJT05TX0ZJTEUgMAorI2RlZmluZSBPUFRJT05TX0ZJTEVO QU1FICIvdG1wL2pzYy5vcHRpb25zIgorCiBuYW1lc3BhY2UgSlNDIHsKIAogc3RhdGljIGJvb2wg cGFyc2UoY29uc3QgY2hhciogc3RyaW5nLCBib29sJiB2YWx1ZSkKQEAgLTM2Miw2ICszNjYsMzEg QEAgdm9pZCBPcHRpb25zOjppbml0aWFsaXplKCkKICAgICAKICAgICAgICAgICAgIHJlY29tcHV0 ZURlcGVuZGVudE9wdGlvbnMoKTsKIAorI2lmIFVTRShPUFRJT05TX0ZJTEUpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgY29uc3QgY2hhciogZmlsZW5hbWUgPSBPUFRJT05TX0ZJTEVO QU1FOworICAgICAgICAgICAgICAgIEZJTEUqIG9wdGlvbnNGaWxlID0gZm9wZW4oZmlsZW5hbWUs ICJyIik7CisgICAgICAgICAgICAgICAgaWYgKCFvcHRpb25zRmlsZSkgeworICAgICAgICAgICAg ICAgICAgICBkYXRhTG9nRigiRmFpbGVkIHRvIG9wZW4gZmlsZSAlcy4gRGlkIHlvdSBhZGQgdGhl IGZpbGUtcmVhZC1kYXRhIGVudGl0bGVtZW50IHRvIFdlYlByb2Nlc3Muc2I/XG4iLCBmaWxlbmFt ZSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAg ICAgICAgICAgICAgIGNoYXIqIGxpbmU7CisgICAgICAgICAgICAgICAgY2hhciBidWZmZXJbQlVG U0laXTsKKyAgICAgICAgICAgICAgICB3aGlsZSAoKGxpbmUgPSBmZ2V0cyhidWZmZXIsIHNpemVv ZihidWZmZXIpLCBvcHRpb25zRmlsZSkpKQorICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFw cGVuZChidWZmZXIpOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGNvbnN0IGNo YXIqIG9wdGlvbnNTdHIgPSBidWlsZGVyLnRvU3RyaW5nKCkudXRmOCgpLmRhdGEoKTsKKyAgICAg ICAgICAgICAgICBkYXRhTG9nRigiU2V0dGluZyBvcHRpb25zOiAlc1xuIiwgb3B0aW9uc1N0cik7 CisgICAgICAgICAgICAgICAgc2V0T3B0aW9ucyhvcHRpb25zU3RyKTsKKyAgICAgICAgICAgICAg ICAKKyAgICAgICAgICAgICAgICBpbnQgcmVzdWx0ID0gZmNsb3NlKG9wdGlvbnNGaWxlKTsKKyAg ICAgICAgICAgICAgICBpZiAocmVzdWx0KQorICAgICAgICAgICAgICAgICAgICBkYXRhTG9nRigi RmFpbGVkIHRvIGNsb3NlIGZpbGUgJXM6ICVzXG4iLCBmaWxlbmFtZSwgc3RyZXJyb3IoZXJybm8p KTsKKyAgICAgICAgICAgIH0KKyNlbmRpZgorCiAgICAgICAgICAgICAvLyBEbyByYW5nZSBjaGVj a3Mgd2hlcmUgbmVlZGVkIGFuZCBtYWtlIGNvcnJlY3Rpb25zIHRvIHRoZSBvcHRpb25zOgogICAg ICAgICAgICAgQVNTRVJUKE9wdGlvbnM6OnRocmVzaG9sZEZvck9wdGltaXplQWZ0ZXJMb25nV2Fy bVVwKCkgPj0gT3B0aW9uczo6dGhyZXNob2xkRm9yT3B0aW1pemVBZnRlcldhcm1VcCgpKTsKICAg ICAgICAgICAgIEFTU0VSVChPcHRpb25zOjp0aHJlc2hvbGRGb3JPcHRpbWl6ZUFmdGVyV2FybVVw KCkgPj0gT3B0aW9uczo6dGhyZXNob2xkRm9yT3B0aW1pemVTb29uKCkpOwpAQCAtNDEwLDYgKzQz OSwxMiBAQCBib29sIE9wdGlvbnM6OnNldE9wdGlvbnMoY29uc3QgY2hhciogb3B0CiAgICAgY2hh ciogcCA9IG9wdGlvbnNTdHJDb3B5OwogCiAgICAgd2hpbGUgKHAgPCBlbmQpIHsKKyAgICAgICAg Ly8gU2tpcCB3aGl0ZSBzcGFjZS4KKyAgICAgICAgd2hpbGUgKHAgPCBlbmQgJiYgc3RkOjppc3Nw YWNlKCpwKSkKKyAgICAgICAgICAgIHArKzsKKyAgICAgICAgaWYgKHAgPT0gZW5kKQorICAgICAg ICAgICAgYnJlYWs7CisKICAgICAgICAgY2hhciogb3B0aW9uU3RhcnQgPSBwOwogICAgICAgICBw ID0gc3Ryc3RyKHAsICI9Iik7CiAgICAgICAgIGlmICghcCkgewpAQCAtNDMwLDcgKzQ2NSw5IEBA IGJvb2wgT3B0aW9uczo6c2V0T3B0aW9ucyhjb25zdCBjaGFyKiBvcHQKICAgICAgICAgICAgIGhh c1N0cmluZ1ZhbHVlID0gdHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAgIHAgPSBzdHJzdHIocCwg IiAiKTsKKyAgICAgICAgLy8gRmluZCBuZXh0IHdoaXRlIHNwYWNlLgorICAgICAgICB3aGlsZSAo cCA8IGVuZCAmJiAhc3RkOjppc3NwYWNlKCpwKSkKKyAgICAgICAgICAgIHArKzsKICAgICAgICAg aWYgKCFwKQogICAgICAgICAgICAgcCA9IGVuZDsgLy8gTm8gbW9yZSAiICIgc2VwYXJhdG9yLiBI ZW5jZSwgdGhpcyBpcyB0aGUgbGFzdCBhcmcuCiAK 259780 2015-08-24 14:45:49 -0700 2015-08-24 14:48:17 -0700 fix 2: use ASCIICType this time. bug-148394.patch text/plain 4238 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4ODgwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE1LTA4LTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgc3VwcG9ydCBmb3Igc2V0dGluZyBKU0Mgb3B0aW9ucyBmcm9tIGEgZmlsZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODM5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGZv ciBlbnZpcm9ubWVudHMgd2hlcmUgdGhlIEpTQyBleGVjdXRhYmxlIGRvZXMgbm90IGhhdmUgYWNj ZXNzIHRvCisgICAgICAgIGVudmlyb25tZW50YWwgdmFyaWFibGVzLiAgVGhpcyBpcyBvbmx5IG5l ZWRlZCBmb3IgZGVidWdnaW5nLCBhbmQgaXMgY3VycmVudGx5CisgICAgICAgIGd1YXJkZWQgdW5k ZXIgYSAjZGVmaW5lIFVTRV9PUFRJT05TX0ZJTEUgaW4gT3B0aW9ucy5jcHAsIGFuZCBpcyBkaXNh YmxlZCBieQorICAgICAgICBkZWZhdWx0LgorCisgICAgICAgIEFsc28gZml4ZWQgT3B0aW9uczo6 c2V0T3B0aW9ucygpIHRvIGJlIGFsbG93IGZvciB3aGl0ZXNwYWNlIHRoYXQgaXMgbm90IGEgc2lu Z2xlCisgICAgICAgICcgJy4gIFRoaXMgbWFrZXMgc2V0T3B0aW9ucygpIG11Y2ggbW9yZSBmbGV4 aWJsZSBhbmQgZnJpZW5kbGllciB0byB1c2UgZm9yIGxvYWRpbmcKKyAgICAgICAgb3B0aW9ucyBp biBnZW5lcmFsLgorCisgICAgICAgIEZvciBleGFtcGxlLCB0aGlzIGN1cnJlbnQgdXNlIGNhc2Ug b2YgbG9hZGluZyBvcHRpb25zIGZyb20gYSBmaWxlIG1heSBoYXZlICdcbidzCisgICAgICAgIGlu IHRoZSBjaGFyYWN0ZXIgc3RyZWFtLCBhbmQgdGhpcyBmZWF0dXJlIGlzIGVhc2llciB0byBpbXBs ZW1lbnQgaWYgc2V0T3B0aW9ucygpCisgICAgICAgIGp1c3Qgc3VwcG9ydCBtb3JlIHRoYW4gMSB3 aGl0ZXNwYWNlIGNoYXIgYmV0d2VlbiBvcHRpb25zLCBhbmQgcmVjb2duaXplIHdoaXRlc3BhY2UK KyAgICAgICAgY2hhcmFjdGVycyBvdGhlciB0aGFuICcgJy4KKworICAgICAgICAqIHJ1bnRpbWUv T3B0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OnBhcnNlKToKKyAgICAgICAgKEpTQzo6T3B0aW9u czo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChKU0M6Ok9wdGlvbnM6OnNldE9wdGlvbnMpOgorCiAy MDE1LTA4LTIyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgREZH OjpJbnNlcnRpb25TZXQgc2hvdWxkIGJlIHRvbGVyYW50IG9mIG9jY2FzaW9uYWwgb3V0LW9mLW9y ZGVyIGluc2VydGlvbnMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlv bnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlv bnMuY3BwCShyZXZpc2lvbiAxODg4NzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9PcHRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUg PG11dGV4PgogI2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHN0cmluZy5oPgorI2luY2x1 ZGUgPHd0Zi9BU0NJSUNUeXBlLmg+CiAjaW5jbHVkZSA8d3RmL0RhdGFMb2cuaD4KICNpbmNsdWRl IDx3dGYvTnVtYmVyT2ZDb3Jlcy5oPgogI2luY2x1ZGUgPHd0Zi9QYWdlQmxvY2suaD4KQEAgLTQ4 LDYgKzQ5LDkgQEAKICNpbmNsdWRlICJNYWNyb0Fzc2VtYmxlclg4Ni5oIgogI2VuZGlmCiAKKyNk ZWZpbmUgVVNFX09QVElPTlNfRklMRSAwCisjZGVmaW5lIE9QVElPTlNfRklMRU5BTUUgIi90bXAv anNjLm9wdGlvbnMiCisKIG5hbWVzcGFjZSBKU0MgewogCiBzdGF0aWMgYm9vbCBwYXJzZShjb25z dCBjaGFyKiBzdHJpbmcsIGJvb2wmIHZhbHVlKQpAQCAtMzYyLDYgKzM2NiwzMSBAQCB2b2lkIE9w dGlvbnM6OmluaXRpYWxpemUoKQogICAgIAogICAgICAgICAgICAgcmVjb21wdXRlRGVwZW5kZW50 T3B0aW9ucygpOwogCisjaWYgVVNFKE9QVElPTlNfRklMRSkKKyAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICBjb25zdCBjaGFyKiBmaWxlbmFtZSA9IE9QVElPTlNfRklMRU5BTUU7CisgICAg ICAgICAgICAgICAgRklMRSogb3B0aW9uc0ZpbGUgPSBmb3BlbihmaWxlbmFtZSwgInIiKTsKKyAg ICAgICAgICAgICAgICBpZiAoIW9wdGlvbnNGaWxlKSB7CisgICAgICAgICAgICAgICAgICAgIGRh dGFMb2dGKCJGYWlsZWQgdG8gb3BlbiBmaWxlICVzLiBEaWQgeW91IGFkZCB0aGUgZmlsZS1yZWFk LWRhdGEgZW50aXRsZW1lbnQgdG8gV2ViUHJvY2Vzcy5zYj9cbiIsIGZpbGVuYW1lKTsKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICAKKyAgICAgICAgICAgICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisgICAgICAgICAgICAg ICAgY2hhciogbGluZTsKKyAgICAgICAgICAgICAgICBjaGFyIGJ1ZmZlcltCVUZTSVpdOworICAg ICAgICAgICAgICAgIHdoaWxlICgobGluZSA9IGZnZXRzKGJ1ZmZlciwgc2l6ZW9mKGJ1ZmZlciks IG9wdGlvbnNGaWxlKSkpCisgICAgICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGJ1ZmZl cik7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgY29uc3QgY2hhciogb3B0aW9u c1N0ciA9IGJ1aWxkZXIudG9TdHJpbmcoKS51dGY4KCkuZGF0YSgpOworICAgICAgICAgICAgICAg IGRhdGFMb2dGKCJTZXR0aW5nIG9wdGlvbnM6ICVzXG4iLCBvcHRpb25zU3RyKTsKKyAgICAgICAg ICAgICAgICBzZXRPcHRpb25zKG9wdGlvbnNTdHIpOworICAgICAgICAgICAgICAgIAorICAgICAg ICAgICAgICAgIGludCByZXN1bHQgPSBmY2xvc2Uob3B0aW9uc0ZpbGUpOworICAgICAgICAgICAg ICAgIGlmIChyZXN1bHQpCisgICAgICAgICAgICAgICAgICAgIGRhdGFMb2dGKCJGYWlsZWQgdG8g Y2xvc2UgZmlsZSAlczogJXNcbiIsIGZpbGVuYW1lLCBzdHJlcnJvcihlcnJubykpOworICAgICAg ICAgICAgfQorI2VuZGlmCisKICAgICAgICAgICAgIC8vIERvIHJhbmdlIGNoZWNrcyB3aGVyZSBu ZWVkZWQgYW5kIG1ha2UgY29ycmVjdGlvbnMgdG8gdGhlIG9wdGlvbnM6CiAgICAgICAgICAgICBB U1NFUlQoT3B0aW9uczo6dGhyZXNob2xkRm9yT3B0aW1pemVBZnRlckxvbmdXYXJtVXAoKSA+PSBP cHRpb25zOjp0aHJlc2hvbGRGb3JPcHRpbWl6ZUFmdGVyV2FybVVwKCkpOwogICAgICAgICAgICAg QVNTRVJUKE9wdGlvbnM6OnRocmVzaG9sZEZvck9wdGltaXplQWZ0ZXJXYXJtVXAoKSA+PSBPcHRp b25zOjp0aHJlc2hvbGRGb3JPcHRpbWl6ZVNvb24oKSk7CkBAIC00MTAsNiArNDM5LDEyIEBAIGJv b2wgT3B0aW9uczo6c2V0T3B0aW9ucyhjb25zdCBjaGFyKiBvcHQKICAgICBjaGFyKiBwID0gb3B0 aW9uc1N0ckNvcHk7CiAKICAgICB3aGlsZSAocCA8IGVuZCkgeworICAgICAgICAvLyBTa2lwIHdo aXRlIHNwYWNlLgorICAgICAgICB3aGlsZSAocCA8IGVuZCAmJiBpc0FTQ0lJU3BhY2UoKnApKQor ICAgICAgICAgICAgcCsrOworICAgICAgICBpZiAocCA9PSBlbmQpCisgICAgICAgICAgICBicmVh azsKKwogICAgICAgICBjaGFyKiBvcHRpb25TdGFydCA9IHA7CiAgICAgICAgIHAgPSBzdHJzdHIo cCwgIj0iKTsKICAgICAgICAgaWYgKCFwKSB7CkBAIC00MzAsNyArNDY1LDkgQEAgYm9vbCBPcHRp b25zOjpzZXRPcHRpb25zKGNvbnN0IGNoYXIqIG9wdAogICAgICAgICAgICAgaGFzU3RyaW5nVmFs dWUgPSB0cnVlOwogICAgICAgICB9CiAKLSAgICAgICAgcCA9IHN0cnN0cihwLCAiICIpOworICAg ICAgICAvLyBGaW5kIG5leHQgd2hpdGUgc3BhY2UuCisgICAgICAgIHdoaWxlIChwIDwgZW5kICYm ICFpc0FTQ0lJU3BhY2UoKnApKQorICAgICAgICAgICAgcCsrOwogICAgICAgICBpZiAoIXApCiAg ICAgICAgICAgICBwID0gZW5kOyAvLyBObyBtb3JlICIgIiBzZXBhcmF0b3IuIEhlbmNlLCB0aGlz IGlzIHRoZSBsYXN0IGFyZy4KIAo=