X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frepeat.c;h=c0510c5d5e26fc94df4dca0514660c369e8efe4d;hb=4a73877b4d56caed03d383fb4d38347a9774046f;hp=593263f8c4d490f5e27f91db2b946594aadaa693;hpb=3417680e253b1bfc4519347ef06536378026be2a;p=pspp-builds.git diff --git a/src/repeat.c b/src/repeat.c index 593263f8..c0510c5d 100644 --- a/src/repeat.c +++ b/src/repeat.c @@ -355,8 +355,8 @@ parse_ids (struct repeat_entry * e) if (!parse_mixed_vars (&names, &nnames, PV_NONE)) return 0; - e->replacement = xrealloc (e->replacement, - (nnames + n) * sizeof *e->replacement); + e->replacement = xnrealloc (e->replacement, + nnames + n, sizeof *e->replacement); for (i = 0; i < nnames; i++) { e->replacement[n + i] = xstrdup (names[i]); @@ -418,8 +418,8 @@ parse_numbers (struct repeat_entry *e) if (n + (abs (b - a) + 1) > m) { m = n + (abs (b - a) + 1) + 16; - e->replacement = array = xrealloc (array, - m * sizeof *e->replacement); + e->replacement = array = xnrealloc (array, + m, sizeof *e->replacement); } if (a == b) @@ -470,8 +470,8 @@ parse_strings (struct repeat_entry * e) if (n + 1 > m) { m += 16; - e->replacement = string = xrealloc (string, - m * sizeof *e->replacement); + e->replacement = string = xnrealloc (string, + m, sizeof *e->replacement); } string[n++] = lex_token_representation (); lex_get (); @@ -479,7 +479,7 @@ parse_strings (struct repeat_entry * e) lex_match (','); } while (token != '/' && token != '.'); - e->replacement = xrealloc (string, n * sizeof *e->replacement); + e->replacement = xnrealloc (string, n, sizeof *e->replacement); return n; }