diff options
| author | drh <drh@noemail.net> | 2019-12-31 14:49:10 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-12-31 14:49:10 +0000 |
| commit | 5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b (patch) | |
| tree | 0a8359d1c5b0829d9a6292e85665979bf364e076 /src/util.c | |
| parent | d335bc40a6576d8759466d8efaaaf82b04667aaa (diff) | |
| parent | 02ff747bc0a6039cddf6108719426d247026fa18 (diff) | |
| download | sqlite-5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b.tar.gz sqlite-5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b.zip | |
Merge recent enhancements from trunk.
FossilOrigin-Name: 39d55579376906f212271ce9b2d367e3ad029fb173f22c7253312b467970208a
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/util.c b/src/util.c index 2c14911b6..f7a993a76 100644 --- a/src/util.c +++ b/src/util.c @@ -389,7 +389,7 @@ static LONGDOUBLE_TYPE sqlite3Pow10(int E){ int sqlite3AtoF(const char *z, double *pResult, int length, u8 enc){ #ifndef SQLITE_OMIT_FLOATING_POINT int incr; - const char *zEnd = z + length; + const char *zEnd; /* sign * significand * (10 ^ (esign * exponent)) */ int sign = 1; /* sign of significand */ i64 s = 0; /* significand */ @@ -403,9 +403,11 @@ int sqlite3AtoF(const char *z, double *pResult, int length, u8 enc){ assert( enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE || enc==SQLITE_UTF16BE ); *pResult = 0.0; /* Default return value, in case of an error */ + if( length==0 ) return 0; if( enc==SQLITE_UTF8 ){ incr = 1; + zEnd = z + length; }else{ int i; incr = 2; |