The sqlite3_backup_init() interface must lock the destination in case it

needs to change the error message. (CVS 6255)

FossilOrigin-Name: 572378d3a29c7d55fa4a15df14800c26d6c563a1

diff --git a/manifest b/manifest
index a3b1e1045912d9b14f62d925e85a3dd4bf8c2869..b3dd9ca821b022e051eaa4a441a21611c0fe81ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\stest_malloc.c\swhereby\srunning\smulti-threaded\stest\scases\scould\scause\ssubsequent\sOOM\stests\sto\sfail.\s(CVS\s6254)
-D 2009-02-04T15:27:40
+C The\ssqlite3_backup_init()\sinterface\smust\slock\sthe\sdestination\sin\scase\sit\nneeds\sto\schange\sthe\serror\smessage.\s(CVS\s6255)
+D 2009-02-04T16:56:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -101,7 +101,7 @@ F src/alter.c 0ec29744c36c6e976596ce38c16289ebc5dc94db
 F src/analyze.c c86fd6a1425b22b3a46ce72ad403e4280026364f
 F src/attach.c 81d37d1948f409146a7b22b96998fd90649d1fd3
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
-F src/backup.c 1cfa5ed161dc3adede5cf7bb5baa0d03c9d7488c
+F src/backup.c 2419ac3abf57714fbdd5e3cfaaf278ae727d1ced
 F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75
 F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a
 F src/btree.c 71f30e74389aa7ae51421592dfaf69511152677c
@@ -700,7 +700,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 416288a9fa39c7c4d9d414de18edc0423ed83794
-R b4c0076c1c9c96f3ecf8e9deb80bef88
-U danielk1977
-Z f3257774a634c8bfc5bc989d5c869af8
+P 03ea9e591337a3c442080ee7cd01cc4ee85c1357
+R 81020b5e1a4ee3bdeda98e63cca69bd3
+U drh
+Z d9fd2e5280186fa7e77fcf315dea28ee

diff --git a/manifest.uuid b/manifest.uuid
index 781969486f42a6fc627d531303a72820fcd0381b..ae318a40f46678ed98d8448aa6e2b4d0cef04351 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03ea9e591337a3c442080ee7cd01cc4ee85c1357
\ No newline at end of file
+572378d3a29c7d55fa4a15df14800c26d6c563a1
\ No newline at end of file

diff --git a/src/backup.c b/src/backup.c
index 8d77fded694be2d7da62f90caff1643212a4e0d0..d3ffae188912c3c6583206478a1d4aa4a5ab67da 100644 (file)
--- a/src/backup.c
+++ b/src/backup.c
@@ -12,7 +12,7 @@
 ** This file contains the implementation of the sqlite3_backup_XXX() 
 ** API functions and the related features.
 **
-** $Id: backup.c,v 1.5 2009/02/04 01:49:30 shane Exp $
+** $Id: backup.c,v 1.6 2009/02/04 16:56:19 drh Exp $
 */
 #include "sqliteInt.h"
 #include "btreeInt.h"
@@ -134,6 +134,7 @@ sqlite3_backup *sqlite3_backup_init(
   ** a malfunction or a deadlock.
   */
   sqlite3_mutex_enter(pSrcDb->mutex);
+  sqlite3_mutex_enter(pDestDb->mutex);
 
   if( pSrcDb==pDestDb ){
     sqlite3Error(
@@ -181,6 +182,7 @@ sqlite3_backup *sqlite3_backup_init(
     p->pSrc->nBackup++;
   }
 
+  sqlite3_mutex_leave(pDestDb->mutex);
   sqlite3_mutex_leave(pSrcDb->mutex);
   return p;
 }