hholzgra                Wed Sep 10 20:47:34 2003 EDT

  Modified files:              
    /php-src/ext/fdf    fdf.c 
  Log:
  check for FDFErcNoValue was in the wrong execution path,
  should always be treated as 'no error' (should finally fix #22803)
  
  
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.83 php-src/ext/fdf/fdf.c:1.84
--- php-src/ext/fdf/fdf.c:1.83  Mon Jul 14 19:23:01 2003
+++ php-src/ext/fdf/fdf.c       Wed Sep 10 20:47:32 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: fdf.c,v 1.83 2003/07/14 23:23:01 edink Exp $ */
+/* $Id: fdf.c,v 1.84 2003/09/11 00:47:32 hholzgra Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
    http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -386,13 +386,12 @@
                        } 
                        which++;
                } while (err == FDFErcOK);
-               if(err == FDFErcNoValue) err = FDFErcOK;
                efree(buffer); 
                buffer = NULL;
 #endif
        }
 
-       if(err != FDFErcOK) {
+       if((err != FDFErcOK) && (err != FDFErcNoValue)) {
                if(buffer) efree(buffer);
                FDF_FAILURE(err);
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to