[Mysqlpp-commits] r1311 - /trunk/lib/query.cpp

[mysqlpp]

Author: wyoung
Date: Tue Jul 18 16:51:13 2006
New Revision: 1311

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1311&view=rev
Log:
Query was mistakenly deleting string objects not allocated on the heap
in some instances when handling template queries.  resetdb in particular
wasn't actually working correctly.

Modified:
    trunk/lib/query.cpp

Modified: trunk/lib/query.cpp
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/query.cpp?rev=1311&r1=1310&r2=1311&view=diff
==============================================================================
--- trunk/lib/query.cpp (original)
+++ trunk/lib/query.cpp Tue Jul 18 16:51:13 2006
@@ -306,31 +306,30 @@
 {
        sbuffer_.str("");
 
-       char num;
-       SQLString* ss;
-       SQLQueryParms* c;
-
        for (std::vector<SQLParseElement>::iterator i = parse_elems_.begin();
                        i != parse_elems_.end(); ++i) {
                dynamic_cast<std::ostream&>(*this) << i->before;
-               num = i->num;
+               int num = i->num;
                if (num != -1) {
-                       if (num < static_cast<int>(p.size()))
+                       SQLQueryParms* c;
+                       if (num < p.size()) {
                                c = &p;
-                       else if (num < static_cast<int>(def.size()))
+                       }
+                       else if (num < def.size()) {
                                c = &def;
+                       }
                        else {
                                *this << " ERROR";
                                throw BadParamCount(
                                                "Not enough parameters to fill 
the template.");
                        }
-                       ss = pprepare(i->option, (*c)[num], c->bound());
+
+                       SQLString& param = (*c)[num];
+                       SQLString* ss = pprepare(i->option, param, c->bound());
                        dynamic_cast<std::ostream&>(*this) << *ss;
-                       if (!c->bound()) {
-                               // Returned pointer is to dynamically allocated 
object,
-                               // so it's our responsibility to release it.  
(The other
-                               // possibility is that pprepare() simply 
overwrote
-                               // (*c)[num], instead of allocating new memory.)
+                       if (ss != &param) {
+                               // pprepare() returned a new string object 
instead of
+                               // updating param in place, so we need to 
delete it.
                                delete ss;
                        }
                }


_______________________________________________
Mysqlpp-commits mailing list
Mysqlpp-commits@gna.org
https://mail.gna.org/listinfo/mysqlpp-commits