diff options
author | drh <drh@noemail.net> | 2017-06-28 15:56:58 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2017-06-28 15:56:58 +0000 |
commit | d0bbe4e9c25fa8b942ebd514b06904f1cf1d8eb4 (patch) | |
tree | 0fc3ef9695f5e08c9fb3232a89337cba4ed3048c /src/legacy.c | |
parent | e9acf4b48eb1723721bd7693f6f04ec4d19bb3db (diff) | |
parent | 2fb960b545dd7bbdf101d8aced41d1448aa7477e (diff) | |
download | sqlite-d0bbe4e9c25fa8b942ebd514b06904f1cf1d8eb4.tar.gz sqlite-d0bbe4e9c25fa8b942ebd514b06904f1cf1d8eb4.zip |
Incorporate recent trunk changes.
FossilOrigin-Name: 62b8269ba2ff71e2daaa86688698896badd6f6e34ab42fbf92dda7fcda73a230
Diffstat (limited to 'src/legacy.c')
-rw-r--r-- | src/legacy.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/legacy.c b/src/legacy.c index df8e2780f..40959a854 100644 --- a/src/legacy.c +++ b/src/legacy.c @@ -127,11 +127,8 @@ exec_out: rc = sqlite3ApiExit(db, rc); if( rc!=SQLITE_OK && pzErrMsg ){ - int nErrMsg = 1 + sqlite3Strlen30(sqlite3_errmsg(db)); - *pzErrMsg = sqlite3Malloc(nErrMsg); - if( *pzErrMsg ){ - memcpy(*pzErrMsg, sqlite3_errmsg(db), nErrMsg); - }else{ + *pzErrMsg = sqlite3DbStrDup(0, sqlite3_errmsg(db)); + if( *pzErrMsg==0 ){ rc = SQLITE_NOMEM_BKPT; sqlite3Error(db, SQLITE_NOMEM); } |