From cce49334303682c0b45bac329869b02ffbac73b2 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Wed, 30 Dec 2015 01:01:12 +0900 Subject: [PATCH] use simplest version of error checking --- extlib/benz/string.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/extlib/benz/string.c b/extlib/benz/string.c index 5a8279f7..224ff41e 100644 --- a/extlib/benz/string.c +++ b/extlib/benz/string.c @@ -532,21 +532,8 @@ pic_str_string_copy(pic_state *pic) end = len; } -#if 0 -#if 0 - if (start < 0) start = 0; /* should an error be reported? */ - if (end > len) end = len; /* should an error be reported? */ -#else - if ((start < 0) || (end < 0) || (start > len) || (end > len)) + if (start < 0 || end > len || end < start) pic_errorf(pic, "string-copy: invalid index"); -#endif - if (end < start) /* surely this is an error!? */ - pic_errorf(pic, "string-copy: start index > end index"); -#else - /* simplest version to catch all cases as errors */ - if ((start < 0) || (end > len) || (end < start)) - pic_errorf(pic, "string-copy: invalid index"); -#endif return pic_obj_value(pic_str_sub(pic, str, start, end)); }