Changeset 37

Timestamp:

11/30/02 00:09:08 (10 years ago)

Author:

ahu

Message:

\' escaping bug

Location:

trunk/pdns

Files:

• ChangeLog (modified) (1 diff)
• pdns/backends/bind/zone2sql.cc (modified) (3 diffs)

trunk/pdns/ChangeLog

@@ -3 +3 @@
         - added db2 backend to distribution
         - added beginnings of ./configure autoconfiscation of mysql location
+        - fixed very embarrassing bug in bind parser - would die on escaping a '
 
 Changes since 2.8:

trunk/pdns/pdns/backends/bind/zone2sql.cc

@@ -19 +19 @@
 /* accepts a named.conf as parameter and outputs heaps of sql */
 
-// $Id: zone2sql.cc,v 1.2 2002/11/29 22:50:56 ahu Exp $ 
+// $Id: zone2sql.cc,v 1.3 2002/11/29 23:09:08 ahu Exp $ 
 #ifdef WIN32
 # pragma warning ( disable: 4786 )
@@ -42 +42 @@
 StatBag S;
 
-string sqlstr(const string &str)
-{
-  if(str.find("\'")!=string::npos)
-    throw 0;
-
-  string ret="\'";
-  ret+=str;
-  ret+="\'";
-  return ret;
+static const string sqlstr(const string &name)
+{
+  string a="\'";
+
+  for(string::const_iterator i=name.begin();i!=name.end();++i)
+    if(*i=='\'' || *i=='\\'){
+      a+='\\';
+      a+=*i;
+    }
+    else
+      a+=*i;
+  a+="\'";
+  return a;
 }
 
@@ -263 +267 @@
     return 0;
   }
+  catch(exception &e) {
+    cerr<<"died because of STL error: "<<e.what()<<endl;
+    exit(0);
+  }
   catch(...) {
-    cerr<<"An unknown error occured"<<endl;
-    return 0;
+    cerr<<"died because of unknown exception"<<endl;
+    exit(0);
   }