stas            Fri Feb 16 18:48:53 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/mysqli mysqli.c 
  Log:
  use error message size 
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.12&r2=1.72.2.16.2.13&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.12 
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.13
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.12  Mon Jan  1 09:36:03 2007
+++ php-src/ext/mysqli/mysqli.c Fri Feb 16 18:48:53 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.72.2.16.2.12 2007/01/01 09:36:03 sebastian Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.13 2007/02/16 18:48:53 stas Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1130,10 +1130,10 @@
        mysqli_local_infile *data = (mysqli_local_infile *) ptr;
 
        if (data) {
-               strcpy(error_msg, data->error_msg);
+               strlcpy(error_msg, data->error_msg, error_msg_len);
                return 2000;
        } 
-       strcpy(error_msg, ER(CR_OUT_OF_MEMORY));
+       strlcpy(error_msg, ER(CR_OUT_OF_MEMORY), error_msg_len);
        return CR_OUT_OF_MEMORY;
 }
 /* }}} */

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

Reply via email to