[Gnash-commit] gnash ./ChangeLog server/styles.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/21 16:16:18

Modified files:
        .              : ChangeLog 
        server         : styles.cpp 

Log message:
        * server/styles.cpp: Don't abort if we read a bad gradient.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/styles.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.28 gnash/ChangeLog:1.29
--- gnash/ChangeLog:1.28        Sat Jan 21 16:08:40 2006
+++ gnash/ChangeLog     Sat Jan 21 16:16:17 2006
@@ -1,5 +1,7 @@
 2006-01-21  Rob Savoye  <address@hidden>
 
+       * server/styles.cpp: Don't abort if we read a bad gradient.
+
        * macros/sdl.m4: Store the compilation flags so the compilation
        tests works on ppc-linux.
 
Index: gnash/server/styles.cpp
diff -u gnash/server/styles.cpp:1.2 gnash/server/styles.cpp:1.3
--- gnash/server/styles.cpp:1.2 Fri Jan 20 19:26:25 2006
+++ gnash/server/styles.cpp     Sat Jan 21 16:16:17 2006
@@ -96,12 +96,15 @@
                                
                        // GRADIENT
                        int     num_gradients = in->read_u8();
-
+//                     assert(num_gradients >= 1 && num_gradients <= 8)
+#if 0
+                       if (num_gradients < 1 || num_gradients > 8) {
+#else
                        if (num_gradients >= 1 && num_gradients <= 8) {
-                               fprintf(stderr, "ERROR: %s (%d): %d read bad 
gradient value!\n",
+#endif
+                               fprintf(stderr, "WARNING: %s (%d): %d read bad 
gradient value!\n",
                                        __PRETTY_FUNCTION__, __LINE__,
                                        num_gradients);
-                               abort();
                        }                       
                        m_gradients.resize(num_gradients);
                        for (int i = 0; i < num_gradients; i++)