shithub: choc

Info  •  Files  •  Log  •  Branches

Strip out NUL characters from dehacked files; this makes the dehacked
patch with portal.wad load properly.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1208

--- a/src/deh_io.c

+++ b/src/deh_io.c

@@ -142,7 +142,7 @@

     int c;

     int pos;

-    for (pos=0; ; ++pos)

+    for (pos = 0;;)

     {

         c = DEH_GetChar(context);

@@ -153,11 +153,6 @@

             return NULL;

         }

-        if (c == '\0')

-        {

-            return NULL;

-        }

-

         // cope with lines of any length: increase the buffer size

         if (pos >= context->readbuffer_size)

@@ -172,9 +167,13 @@

             context->readbuffer[pos] = '\0';

             break;

         }

-        else

+        else if (c != '\0')

         {

+            // normal character; don't allow NUL characters to be

+            // added.

+

             context->readbuffer[pos] = (char) c;

+            ++pos;

         }

     }