diff options
| author | Mike Pall <mike> | 2015-02-22 23:08:56 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-02-22 23:08:56 +0100 |
| commit | 906008d46762df38c037ff0a93d03b8067b6e499 (patch) | |
| tree | a33fc9dc1c245cd662352992ccff2334c1e8d07a /src | |
| parent | 576ddf1db52de9c7f5aab542fc004fb2e45ba763 (diff) | |
| parent | e6b0875a7e8fa3b3fbc348636b6fa2f26a095af9 (diff) | |
| download | luajit-906008d46762df38c037ff0a93d03b8067b6e499.tar.gz luajit-906008d46762df38c037ff0a93d03b8067b6e499.tar.bz2 luajit-906008d46762df38c037ff0a93d03b8067b6e499.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_strscan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_strscan.c b/src/lj_strscan.c index e2cf76f4..568f647d 100644 --- a/src/lj_strscan.c +++ b/src/lj_strscan.c | |||
| @@ -199,7 +199,7 @@ static StrScanFmt strscan_dec(const uint8_t *p, TValue *o, | |||
| 199 | *xip++ = d + ((*p != '.' ? *p : *++p) & 15); p++; | 199 | *xip++ = d + ((*p != '.' ? *p : *++p) & 15); p++; |
| 200 | } | 200 | } |
| 201 | /* Scan and realign trailing digit. */ | 201 | /* Scan and realign trailing digit. */ |
| 202 | if (i) *xip++ = 10 * ((*p != '.' ? *p : *++p) & 15), ex10--, p++; | 202 | if (i) *xip++ = 10 * ((*p != '.' ? *p : *++p) & 15), ex10--, dig++, p++; |
| 203 | 203 | ||
| 204 | /* Summarize rounding-effect of excess digits. */ | 204 | /* Summarize rounding-effect of excess digits. */ |
| 205 | if (dig > STRSCAN_MAXDIG) { | 205 | if (dig > STRSCAN_MAXDIG) { |