database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

- fix use of uninitialized variable (colp)

Browse Source 
modified:
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.cpp
This commit is contained in:
Olivier Bertrand
2013-05-13 11:37:34 +02:00
parent 35f813143b
commit dee955bdee
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/connect/tabtbl.cpp
View File

@ -239,14 +239,10 @@ bool TDBTBL::InitTableList(PGLOBAL g)
// We must allocate subtable columns before GetMaxSize is called // We must allocate subtable columns before GetMaxSize is called
// because some (PLG, ODBC?) need to have their columns attached. // because some (PLG, ODBC?) need to have their columns attached.
// Real initialization will be done later. // Real initialization will be done later.
for (PCOL cp = Columns; cp; cp = cp->GetNext()) for (colp = Columns; colp; colp = colp->GetNext())
if (!cp->IsSpecial()) { if (!colp->IsSpecial())
if (((PPRXCOL)cp)->Init(g) && !Accept) if (((PPRXCOL)colp)->Init(g) && !Accept)
return TRUE; return TRUE;
else // this is needed by some tables (which?)
colp->SetColUse(cp->GetColUse());
} // endif !special
if (Tablist) if (Tablist)
Tablist->Link(tabp); Tablist->Link(tabp);

6
storage/connect/tabutil.cpp
View File

@ -531,8 +531,12 @@ bool PRXCOL::Init(PGLOBAL g)
Colp = tdbp->Tdbp->ColDB(g, NULL, Colnum); Colp = tdbp->Tdbp->ColDB(g, NULL, Colnum);
if (Colp) { if (Colp) {
Colp->InitValue(g); // May not have been done elsewhere // May not have been done elsewhere
Colp->InitValue(g);
To_Val = Colp->GetValue(); To_Val = Colp->GetValue();
// this may be needed by some tables (which?)
Colp->SetColUse(ColUse);
} else { } else {
sprintf(g->Message, MSG(NO_MATCHING_COL), Name, tdbp->Tdbp->GetName()); sprintf(g->Message, MSG(NO_MATCHING_COL), Name, tdbp->Tdbp->GetName());
return TRUE; return TRUE;