From 08a5dab181fa4c28b7636c35021308e1e12e7b59 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 17 Nov 2014 20:27:18 +0100 Subject: ash: fix handling of negative start value in ${v:start:len} function old new delta subevalvar 1140 1168 +28 Signed-off-by: Denys Vlasenko --- shell/ash.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index 705fe9fa4..90fb00fbd 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -6411,7 +6411,15 @@ subevalvar(char *p, char *varname, int strloc, int subtype, len = number(loc); } } - if (pos >= orig_len) { + if (pos < 0) { + /* ${VAR:$((-n)):l} starts n chars from the end */ + pos = orig_len + pos; + } + if ((unsigned)pos >= orig_len) { + /* apart from obvious ${VAR:999999:l}, + * covers ${VAR:$((-9999999)):l} - result is "" + * (bash-compat) + */ pos = 0; len = 0; } -- cgit v1.2.3