summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2011-10-11 20:18:30 +0000
committerPatrick Ohly <patrick.ohly@intel.com>2011-10-11 20:18:30 +0000
commit5594f7087ab004dbbb905f5296e11bc5860c5406 (patch)
treeb262e0396743a71a0d6720ace08359837ea7d47e
parent2b1065792a3c3340f4f7e5a49e832f4d8f2f0949 (diff)
DB_Conflict (409): fixed uninitialized memory access
aChangedNewVersion in TCustomImplDS::mergeWithDatabaseVersion() was only initialized if it had to be set to true while doing the merge. It had to be set to false somewhere up the stack.
-rwxr-xr-xsrc/sysync/customimplds.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sysync/customimplds.cpp b/src/sysync/customimplds.cpp
index 219e8d3..3bdf4b3 100755
--- a/src/sysync/customimplds.cpp
+++ b/src/sysync/customimplds.cpp
@@ -2723,6 +2723,7 @@ localstatus TCustomImplDS::implProcessMap(cAppCharP aRemoteID, cAppCharP aLocalI
TMultiFieldItem *TCustomImplDS::mergeWithDatabaseVersion(TSyncItem *aSyncItemP, bool &aChangedDBVersion, bool &aChangedNewVersion)
{
aChangedDBVersion = false;
+ aChangedNewVersion = false;
TStatusCommand dummy(fSessionP);
TMultiFieldItem *dbVersionItemP = (TMultiFieldItem *)newItemForRemote(aSyncItemP->getTypeID());