diff options
| author | Miles Bader <miles@gnu.org> | 2003-04-18 01:23:43 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2003-04-18 01:23:43 +0000 |
| commit | c6464167c6d78835d83ed090aaa5e4dc5e1f520d (patch) | |
| tree | c721b6ad4e436053a8da7788c170e606e3a7a460 /src/data.c | |
| parent | e509f1689ace103dc0860661d599cd25fdb2e766 (diff) | |
| download | emacs-c6464167c6d78835d83ed090aaa5e4dc5e1f520d.tar.gz | |
(Faset): Calculate nbytes earlier, to satisfy the now pickier
PARSE_MULTIBYTE_SEQ.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index 5b03f0ebff2..b52aff10819 100644 --- a/src/data.c +++ b/src/data.c @@ -2029,13 +2029,15 @@ bool-vector. IDX starts at 0. */) } else if (STRING_MULTIBYTE (array)) { - int idxval_byte, prev_bytes, new_bytes; + int idxval_byte, prev_bytes, new_bytes, nbytes; unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; if (idxval < 0 || idxval >= SCHARS (array)) args_out_of_range (array, idx); CHECK_NUMBER (newelt); + nbytes = SBYTES (array); + idxval_byte = string_char_to_byte (array, idxval); p1 = SDATA (array) + idxval_byte; PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes); @@ -2044,7 +2046,6 @@ bool-vector. IDX starts at 0. */) { /* We must relocate the string data. */ int nchars = SCHARS (array); - int nbytes = SBYTES (array); unsigned char *str; str = (nbytes <= MAX_ALLOCA |