Changeset 6131

Timestamp:

12/08/09 18:41:30 (3 years ago)

Author:

westram

Message:

• stuffed a memleak in xml-lib
• arb_help2xml no longer accepts lines longer that 200 characters

Warning: ARB-help won't build atm

Location:

trunk

Files:

• HELP_SOURCE/arb_help2xml.cxx (modified) (2 diffs)
• XML/xml.cxx (modified) (1 diff)

trunk/HELP_SOURCE/arb_help2xml.cxx

@@ -42 +42 @@
 
 // #define DUMP_DATA // use this to see internal data (class Helpfile)
-#define MAX_LINE_LENGTH 500     // maximum length of lines in input stream
+#define MAX_LINE_LENGTH 200     // maximum length of lines in input stream
 #define TABSIZE         8
 
@@ -139 +139 @@
     void getline() {
         if (!eof) {
-            if (!in.good()) eof = true;
-            in.getline(lineBuffer, MAX_LINE_LENGTH);
-            lineNo++;
-
-            if (strchr(lineBuffer, '\t')) {
-                int o2 = 0;
-
-                for (int o = 0; lineBuffer[o]; ++o) {
-                    if (lineBuffer[o] == '\t') {
-                        int spaces = TABSIZE - (o2 % TABSIZE);
-                        while (spaces--) lineBuffer2[o2++] = ' ';
+            if (in.eof()) eof = true;
+            else {
+                h2x_assert(in.good());
+
+                in.getline(lineBuffer, MAX_LINE_LENGTH);
+                lineNo++;
+
+                if (in.eof()) eof = true;
+                else if (in.fail()) throw "line too long";
+
+                if (strchr(lineBuffer, '\t')) {
+                    int o2 = 0;
+
+                    for (int o = 0; lineBuffer[o]; ++o) {
+                        if (lineBuffer[o] == '\t') {
+                            int spaces = TABSIZE - (o2 % TABSIZE);
+                            while (spaces--) lineBuffer2[o2++] = ' ';
+                        }
+                        else {
+                            lineBuffer2[o2++] = lineBuffer[o];
+                        }
                     }
-                    else {
-                        lineBuffer2[o2++] = lineBuffer[o];
-                    }
-                }
-                lineBuffer2[o2] = 0;
-                strcpy(lineBuffer, lineBuffer2);
+                    lineBuffer2[o2] = 0;
+                    strcpy(lineBuffer, lineBuffer2);
+                }
             }
         }

trunk/XML/xml.cxx

@@ -145 +145 @@
 XML_Tag::~XML_Tag() {
     FILE *out = the_XML_Document->Out();
-    if (son) {
-        throw string("XML_Tag has son in destructor");
-    }
+    if (son) throw string("XML_Tag has son in destructor");
     close(out);
+
+    delete attribute;
 }