From dee955bdee939506804fdc36bf33224e2b104926 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon, 13 May 2013 11:37:34 +0200
Subject: [PATCH] - fix use of uninitialized variable (colp)

modified:
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.cpp
---
 storage/connect/tabtbl.cpp  | 10 +++-------
 storage/connect/tabutil.cpp |  6 +++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/storage/connect/tabtbl.cpp b/storage/connect/tabtbl.cpp
index 7b10089ea36..7e89cccf583 100644
--- a/storage/connect/tabtbl.cpp
+++ b/storage/connect/tabtbl.cpp
@@ -239,14 +239,10 @@ bool TDBTBL::InitTableList(PGLOBAL g)
       // We must allocate subtable columns before GetMaxSize is called
       // because some (PLG, ODBC?) need to have their columns attached.
       // Real initialization will be done later.
-      for (PCOL cp = Columns; cp; cp = cp->GetNext())
-        if (!cp->IsSpecial()) {
-          if (((PPRXCOL)cp)->Init(g) && !Accept)
+      for (colp = Columns; colp; colp = colp->GetNext())
+        if (!colp->IsSpecial())
+          if (((PPRXCOL)colp)->Init(g) && !Accept)
             return TRUE;
-          else // this is needed by some tables (which?)
-            colp->SetColUse(cp->GetColUse());
-
-          } // endif !special
 
       if (Tablist)
         Tablist->Link(tabp);
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp
index 2c14b711f86..c55b8d1fa5c 100644
--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
@@ -531,8 +531,12 @@ bool PRXCOL::Init(PGLOBAL g)
     Colp = tdbp->Tdbp->ColDB(g, NULL, Colnum);
 
   if (Colp) {
-    Colp->InitValue(g);        // May not have been done elsewhere
+    // May not have been done elsewhere
+    Colp->InitValue(g);        
     To_Val = Colp->GetValue();
+
+    // this may be needed by some tables (which?)
+    Colp->SetColUse(ColUse);
   } else {
     sprintf(g->Message, MSG(NO_MATCHING_COL), Name, tdbp->Tdbp->GetName());
     return TRUE;