tony2001 Thu Dec 28 20:45:36 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mime_magic mime_magic.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.13.2.13.2.1&r2=1.13.2.13.2.2&diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.13.2.13.2.1
php-src/ext/mime_magic/mime_magic.c:1.13.2.13.2.2
--- php-src/ext/mime_magic/mime_magic.c:1.13.2.13.2.1 Sun Jan 1 13:46:54 2006
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 28 20:45:36 2006
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.13.2.13.2.1 2006/01/01 13:46:54 sniper Exp $
+ $Id: mime_magic.c,v 1.13.2.13.2.2 2006/12/28 20:45:36 tony2001 Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -651,9 +651,7 @@
}
else
m->nospflag = 0;
- strncpy(m->desc, l, sizeof(m->desc) - 1);
- m->desc[sizeof(m->desc) - 1] = '\0';
-
+ strlcpy(m->desc, l, sizeof(m->desc));
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
