summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNei <ailin.nemui@gmail.com>2018-01-04 22:19:21 +0000
committerNei <ailin.nemui@gmail.com>2018-01-04 22:19:21 +0000
commitcf70fcd4b9b035e600462e8e5fa895c82741e721 (patch)
tree317edcf646365645ac69a2080b5ddb2f1f50bcf4 /src
parente405330e04dc344797f00c12cf8fd7f63b17e0e4 (diff)
parentcc17837a9b326ec9100a35981348fa0f5d6316fa (diff)
downloadirssi-cf70fcd4b9b035e600462e8e5fa895c82741e721.zip
Merge branch 'fix-gl-18' into 'security'
disable variable arguments code See merge request irssi/irssi!28
Diffstat (limited to 'src')
-rw-r--r--src/core/special-vars.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index aaf8da8f..f254c200 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -384,6 +384,7 @@ char *parse_special(char **cmd, SERVER_REC *server, void *item,
}
nest_free = FALSE; nest_value = NULL;
+#if 0 /* this code is disabled due to security issues until it is fixed */
if (**cmd == '(' && (*cmd)[1] != '\0') {
/* subvariable */
int toplevel = nested_orig_cmd == NULL;
@@ -412,6 +413,9 @@ char *parse_special(char **cmd, SERVER_REC *server, void *item,
if (toplevel) nested_orig_cmd = NULL;
}
+#else
+ if (nested_orig_cmd) nested_orig_cmd = NULL;
+#endif
if (**cmd != '{')
brackets = FALSE;