From 5827a23bc72475871ffc45df50d3c6ec0380b150 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 20 Mar 2005 20:07:12 +0100 Subject: ndb - Fix uninit variable (potential segv) in Dbacc::sendNextScanConf discovered by magnus addition in "globals_list" ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fix uninit variable (potential segv) in sendNextScanConf discovered by magnus addition in "globals_list" --- ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ndb') diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index a82c96beebd..f3d5b8a89ef 100644 --- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -11242,10 +11242,10 @@ void Dbacc::execACC_CHECK_SCAN(Signal* signal) operationRecPtr.i = scanPtr.p->scanFirstQueuedOp; ptrCheckGuard(operationRecPtr, coprecsize, operationrec); takeOutReadyScanQueue(signal); + fragrecptr.i = operationRecPtr.p->fragptr; + ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec); if (operationRecPtr.p->elementIsDisappeared == ZTRUE) { jam(); - fragrecptr.i = operationRecPtr.p->fragptr; - ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec); if (fragrecptr.p->createLcp == ZTRUE) { if (remainingUndoPages() < ZMIN_UNDO_PAGES_AT_COMMIT) { jam(); @@ -11890,8 +11890,6 @@ void Dbacc::sendNextScanConf(Signal* signal) return; }//if - fragrecptr.i = operationRecPtr.p->fragptr; - ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec); if (fragrecptr.p->keyLength != 0) { jam(); signal->theData[0] = scanPtr.p->scanUserptr; -- cgit v1.2.1