[PHP-CVS] cvs: php-src(PHP_4_4) /ext/fdf fdf.c

2007-01-02 Thread Ilia Alshanetsky 
iliaa   Wed Jan  3 03:59:23 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/fdffdf.c 
  Log:
  MFH: unlink temporary file on error
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.66.2.13.2.3r2=1.66.2.13.2.4diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.66.2.13.2.3 php-src/ext/fdf/fdf.c:1.66.2.13.2.4
--- php-src/ext/fdf/fdf.c:1.66.2.13.2.3 Mon Jan  1 09:46:41 2007
+++ php-src/ext/fdf/fdf.c   Wed Jan  3 03:59:23 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fdf.c,v 1.66.2.13.2.3 2007/01/01 09:46:41 sebastian Exp $ */
+/* $Id: fdf.c,v 1.66.2.13.2.4 2007/01/03 03:59:23 iliaa Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1210,20 +1210,19 @@
if(err == FDFErcOK  nBytes != 0) {
for(p=value;*p;p++) if(*p=='\r') 
*p='\n';
if(lastfieldname) efree(lastfieldname);
-   lastfieldname = estrdup(name);  
+   lastfieldname = estrdup(name);
php_register_variable(name, value, 
array_ptr TSRMLS_CC);
} 
}
}   
-   
FDFClose(theFDF);
-   VCWD_UNLINK((const char *)filename);
-   efree(filename);
 
if(name)  efree(name);
if(value) efree(value);
if(lastfieldname) efree(lastfieldname);
} 
+   VCWD_UNLINK((const char *)filename);
+   efree(filename);
 }
 /* }}} */
 

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

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/fdf fdf.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:41:27 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/fdffdf.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.66.2.13.2.1r2=1.66.2.13.2.2diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.66.2.13.2.1 php-src/ext/fdf/fdf.c:1.66.2.13.2.2
--- php-src/ext/fdf/fdf.c:1.66.2.13.2.1 Sun Jan  1 13:46:52 2006
+++ php-src/ext/fdf/fdf.c   Thu Dec 28 20:41:27 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fdf.c,v 1.66.2.13.2.1 2006/01/01 13:46:52 sniper Exp $ */
+/* $Id: fdf.c,v 1.66.2.13.2.2 2006/12/28 20:41:27 tony2001 Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1492,8 +1492,7 @@
RETURN_FALSE;
}
 
-   strncpy(pathbuf , savepath, MAXPATHLEN-1);
-   pathbuf[MAXPATHLEN-1] = '\0';
+   strlcpy(pathbuf, savepath, sizeof(pathbuf));
 
if(0 == stat(pathbuf, statBuf)) {
is_dir = S_ISDIR(statBuf.st_mode);

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