mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-21 12:10:26 +02:00
Code Activity

(scm_string_any, scm_string_every,

Browse source 
scm_string_tabulate, string_upcase_x, string_down_case_x,
string_titlecase_x, string_reverse_x, scm_string_tokenize): Use
size_t instead of int for indices into strings.  Make sure that no
over- or underflow occurs.  Thanks to Andreas Vögele!
(scm_xsubstring, scm_string_xcopy_x): Use ints for 'extended'
indices, which can also be negative.
This commit is contained in:
Marius Vollmer 2004-09-20 22:50:31 +00:00
parent b00b73f98f
commit 1a82a4606c
1 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

51
libguile/srfi-13.c
View file

@ -106,7 +106,7 @@ SCM_DEFINE (scm_string_any, "string-any", 2, 2, 0,
} }
else if (SCM_CHARSETP (char_pred)) else if (SCM_CHARSETP (char_pred))
{ {
int i; size_t i;
for (i = cstart; i < cend; i++) for (i = cstart; i < cend; i++)
if (SCM_CHARSET_GET (char_pred, cstr[i])) if (SCM_CHARSET_GET (char_pred, cstr[i]))
{ {
@ -163,7 +163,7 @@ SCM_DEFINE (scm_string_every, "string-every", 2, 2, 0,
if (SCM_CHARP (char_pred)) if (SCM_CHARP (char_pred))
{ {
char cchr = SCM_CHAR (char_pred); char cchr = SCM_CHAR (char_pred);
int i; size_t i;
for (i = cstart; i < cend; i++) for (i = cstart; i < cend; i++)
if (cstr[i] != cchr) if (cstr[i] != cchr)
{ {
@ -173,7 +173,7 @@ SCM_DEFINE (scm_string_every, "string-every", 2, 2, 0,
} }
else if (SCM_CHARSETP (char_pred)) else if (SCM_CHARSETP (char_pred))
{ {
int i; size_t i;
for (i = cstart; i < cend; i++) for (i = cstart; i < cend; i++)
if (!SCM_CHARSET_GET (char_pred, cstr[i])) if (!SCM_CHARSET_GET (char_pred, cstr[i]))
{ {
@ -225,7 +225,7 @@ SCM_DEFINE (scm_string_tabulate, "string-tabulate", 2, 0, 0,
/* The RES string remains untouched since nobody knows about it /* The RES string remains untouched since nobody knows about it
yet. No need to refetch P. yet. No need to refetch P.
*/ */
ch = scm_call_1 (proc, scm_from_int (i)); ch = scm_call_1 (proc, scm_from_size_t (i));
if (!SCM_CHARP (ch)) if (!SCM_CHARP (ch))
SCM_MISC_ERROR ("procedure ~S returned non-char", scm_list_1 (proc)); SCM_MISC_ERROR ("procedure ~S returned non-char", scm_list_1 (proc));
*p++ = SCM_CHAR (ch); *p++ = SCM_CHAR (ch);
@ -2326,7 +2326,7 @@ SCM_DEFINE (scm_string_contains_ci, "string-contains-ci", 2, 4, 0,
/* Helper function for the string uppercase conversion functions. /* Helper function for the string uppercase conversion functions.
* No argument checking is performed. */ * No argument checking is performed. */
static SCM static SCM
string_upcase_x (SCM v, int start, int end) string_upcase_x (SCM v, size_t start, size_t end)
{ {
size_t k; size_t k;
char *dst; char *dst;
@ -2392,7 +2392,7 @@ scm_string_upcase (SCM str)
/* Helper function for the string lowercase conversion functions. /* Helper function for the string lowercase conversion functions.
* No argument checking is performed. */ * No argument checking is performed. */
static SCM static SCM
string_downcase_x (SCM v, int start, int end) string_downcase_x (SCM v, size_t start, size_t end)
{ {
size_t k; size_t k;
char *dst; char *dst;
@ -2460,7 +2460,7 @@ scm_string_downcase (SCM str)
/* Helper function for the string capitalization functions. /* Helper function for the string capitalization functions.
* No argument checking is performed. */ * No argument checking is performed. */
static SCM static SCM
string_titlecase_x (SCM str, int start, int end) string_titlecase_x (SCM str, size_t start, size_t end)
{ {
unsigned char *sz; unsigned char *sz;
size_t i; size_t i;
@ -2555,18 +2555,21 @@ SCM_DEFINE (scm_string_capitalize, "string-capitalize", 1, 0, 0,
/* Reverse the portion of @var{str} between str[cstart] (including) /* Reverse the portion of @var{str} between str[cstart] (including)
and str[cend] excluding. */ and str[cend] excluding. */
static void static void
string_reverse_x (char * str, int cstart, int cend) string_reverse_x (char * str, size_t cstart, size_t cend)
{ {
char tmp; char tmp;
cend--; if (cend > 0)
while (cstart < cend)
{ {
tmp = str[cstart];
str[cstart] = str[cend];
str[cend] = tmp;
cstart++;
cend--; cend--;
while (cstart < cend)
{
tmp = str[cstart];
str[cstart] = str[cend];
str[cend] = tmp;
cstart++;
cend--;
}
} }
} }
@ -3012,18 +3015,19 @@ SCM_DEFINE (scm_xsubstring, "xsubstring", 2, 3, 0,
{ {
const char *cs; const char *cs;
char *p; char *p;
size_t cstart, cend, cfrom, cto; size_t cstart, cend;
int cfrom, cto;
SCM result; SCM result;
MY_VALIDATE_SUBSTRING_SPEC (1, s, MY_VALIDATE_SUBSTRING_SPEC (1, s,
4, start, cstart, 4, start, cstart,
5, end, cend); 5, end, cend);
cfrom = scm_to_size_t (from); cfrom = scm_to_int (from);
if (SCM_UNBNDP (to)) if (SCM_UNBNDP (to))
cto = cfrom + (cend - cstart); cto = cfrom + (cend - cstart);
else else
cto = scm_to_size_t (to); cto = scm_to_int (to);
if (cstart == cend && cfrom != cto) if (cstart == cend && cfrom != cto)
SCM_MISC_ERROR ("start and end indices must not be equal", SCM_EOL); SCM_MISC_ERROR ("start and end indices must not be equal", SCM_EOL);
@ -3032,7 +3036,7 @@ SCM_DEFINE (scm_xsubstring, "xsubstring", 2, 3, 0,
cs = scm_i_string_chars (s); cs = scm_i_string_chars (s);
while (cfrom < cto) while (cfrom < cto)
{ {
int t = ((cfrom < 0) ? -cfrom : cfrom) % (cend - cstart); size_t t = ((cfrom < 0) ? -cfrom : cfrom) % (cend - cstart);
if (cfrom < 0) if (cfrom < 0)
*p = cs[(cend - cstart) - t]; *p = cs[(cend - cstart) - t];
else else
@ -3058,7 +3062,8 @@ SCM_DEFINE (scm_string_xcopy_x, "string-xcopy!", 4, 3, 0,
{ {
char *p; char *p;
const char *cs; const char *cs;
size_t ctstart, csfrom, csto, cstart, cend; size_t ctstart, cstart, cend;
int csfrom, csto;
SCM dummy = SCM_UNDEFINED; SCM dummy = SCM_UNDEFINED;
size_t cdummy; size_t cdummy;
@ -3068,11 +3073,11 @@ SCM_DEFINE (scm_string_xcopy_x, "string-xcopy!", 4, 3, 0,
MY_VALIDATE_SUBSTRING_SPEC (3, s, MY_VALIDATE_SUBSTRING_SPEC (3, s,
6, start, cstart, 6, start, cstart,
7, end, cend); 7, end, cend);
csfrom = scm_to_size_t (sfrom); csfrom = scm_to_int (sfrom);
if (SCM_UNBNDP (sto)) if (SCM_UNBNDP (sto))
csto = csfrom + (cend - cstart); csto = csfrom + (cend - cstart);
else else
csto = scm_to_size_t (sto); csto = scm_to_int (sto);
if (cstart == cend && csfrom != csto) if (cstart == cend && csfrom != csto)
SCM_MISC_ERROR ("start and end indices must not be equal", SCM_EOL); SCM_MISC_ERROR ("start and end indices must not be equal", SCM_EOL);
SCM_ASSERT_RANGE (1, tstart, SCM_ASSERT_RANGE (1, tstart,
@ -3082,7 +3087,7 @@ SCM_DEFINE (scm_string_xcopy_x, "string-xcopy!", 4, 3, 0,
cs = scm_i_string_chars (s); cs = scm_i_string_chars (s);
while (csfrom < csto) while (csfrom < csto)
{ {
int t = ((csfrom < 0) ? -csfrom : csfrom) % (cend - cstart); size_t t = ((csfrom < 0) ? -csfrom : csfrom) % (cend - cstart);
if (csfrom < 0) if (csfrom < 0)
*p = cs[(cend - cstart) - t]; *p = cs[(cend - cstart) - t];
else else
@ -3155,7 +3160,7 @@ SCM_DEFINE (scm_string_tokenize, "string-tokenize", 1, 3, 0,
if (SCM_CHARSETP (token_set)) if (SCM_CHARSETP (token_set))
{ {
int idx; size_t idx;
while (cstart < cend) while (cstart < cend)
{ {