Changeset 989 for trunk/pdns/pdns/zoneparser-tng.cc

Timestamp:

03/25/07 14:19:15 (6 years ago)

Author:

ahu

Message:

fix ticket 106 which explains we mis-parse ; in "strings"

Files:

• trunk/pdns/pdns/zoneparser-tng.cc (modified) (3 diffs)

trunk/pdns/pdns/zoneparser-tng.cc

@@ -163 +163 @@
 }
 
+void chopComment(string& line)
+{
+  string::size_type pos, len = line.length();
+  bool inQuote=false;
+  for(pos = 0 ; pos < len; ++pos) {
+    if(line[pos]=='\\') 
+      pos++;
+    else if(line[pos]=='"') 
+      inQuote=!inQuote;
+    else if(line[pos]==';' && !inQuote)
+      break;
+  }
+  if(pos != len)
+    line.resize(pos);
+}
+
 bool ZoneParserTNG::get(DNSResourceRecord& rr) 
 {
@@ -274 +290 @@
   rr.content=d_line.substr(range.first);
 
-  string::size_type pos=rr.content.rfind(';');
-  if(pos!=string::npos)
-    rr.content.resize(pos);
+  chopComment(rr.content);
+  string::size_type pos;
 
   if(rr.qtype.getCode()!=QType::TXT && (pos=rr.content.find('('))!=string::npos) {
@@ -283 +298 @@
     while(getLine()) {
       chomp(d_line,"\r\n ");
-      pos=d_line.rfind(';');
-      if(pos!=string::npos)
-        d_line.resize(pos);
+      chopComment(d_line);
 
       trim(d_line);