X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2Fxpdf%2FGString.cc;h=7653fd06e3e6b1dd2d1ed30f6321dba2e069a22b;hb=c7432833fe3a6469d63fad135151a92e12877b94;hp=3bf626aa41e99321d12da3c07b13e11b35daad7e;hpb=b9ddd4a2ed601bc01ddacc69d2522687a93a94ce;p=swftools.git

diff --git a/pdf2swf/xpdf/GString.cc b/pdf2swf/xpdf/GString.cc
index 3bf626a..7653fd0 100644
--- a/pdf2swf/xpdf/GString.cc
+++ b/pdf2swf/xpdf/GString.cc
@@ -4,15 +4,16 @@
 //
 // Simple variable-length string type.
 //
-// Copyright 1996-2002 Glyph & Cog, LLC
+// Copyright 1996-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma implementation
 #endif
 
-#include <aconf.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
@@ -203,8 +204,12 @@ GString *GString::del(int i, int n) {
   int j;
 
   if (n > 0) {
-    for (j = i; j <= length - n; ++j)
+    if (i + n > length) {
+      n = length - i;
+    }
+    for (j = i; j <= length - n; ++j) {
       s[j] = s[j + n];
+    }
     resize(length -= n);
   }
   return this;