From d9f58253e30ea80e57d8f54e41e9cd114cc13973 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 15 Feb 2010 21:27:37 -0800 Subject: Use clamping to more easily normalize input values The kernel has min/max/clamp macros to make range comparisons easier. Clamp is a newer invention, but we can define it for older kernels in terms of min and max. --- tapset/string.stp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tapset/string.stp') diff --git a/tapset/string.stp b/tapset/string.stp index 59ba74ee..d03e5570 100644 --- a/tapset/string.stp +++ b/tapset/string.stp @@ -27,8 +27,8 @@ function strlen:long(s:string) %{ /* pure */ /* unprivileged */ * starting at the given start position. */ function substr:string(str:string,start:long, length:long) %{ /* pure */ /* unprivileged */ - int length = THIS->length >= MAXSTRINGLEN ? MAXSTRINGLEN : THIS->length + 1; - if (THIS->start >= 0 && length > 0 && THIS->start < strlen(THIS->str)) + int64_t length = clamp_t(int64_t, THIS->length + 1, 0, MAXSTRINGLEN); + if (THIS->start >= 0 && THIS->start < strlen(THIS->str)) strlcpy(THIS->__retvalue, THIS->str + THIS->start, length); %} @@ -87,7 +87,8 @@ function text_str:string(input:string) */ function text_strn:string(input:string, len:long, quoted:long) %{ /* pure */ /* unprivileged */ - _stp_text_str(THIS->__retvalue, THIS->input, THIS->len, THIS->quoted, 0); + int64_t len = clamp_t(int64_t, THIS->len, 0, MAXSTRINGLEN); + _stp_text_str(THIS->__retvalue, THIS->input, len, THIS->quoted, 0); %} /** @@ -162,4 +163,4 @@ function str_replace:string (prnt_str:string, srch_str:string, rplc_str:string) function strtol:long(str:string, base:long) %{ /* pure */ /* unprivileged */ THIS->__retvalue = simple_strtol(THIS->str, NULL, THIS->base); -%} \ No newline at end of file +%} -- cgit