cvs: php-src(PHP_5_2) /ext/mime_magic mime_magic.c
| From: | Antony Dovgal | Date: | Thu, 28 Dec 2006 20:45:27 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/mime_magic mime_magic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42468@lists.php.net to get a copy of this message | ||
tony2001 Thu Dec 28 20:45:27 2006 UTC
Modified files: (Branch: PHP_5_2)
/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.42.2.5.2.3&r2=1.42.2.5.2.4&diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.3
php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.4
--- php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.3 Thu Nov 30 15:13:19 2006
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 28 20:45:27 2006
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <hholzgra@php.net> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.42.2.5.2.3 2006/11/30 15:13:19 iliaa Exp $
+ $Id: mime_magic.c,v 1.42.2.5.2.4 2006/12/28 20:45:27 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:
@@ -730,9 +730,7 @@
return -1;
}
- strncpy(m->desc, l, sizeof(m->desc) - 1);
- m->desc[sizeof(m->desc) - 1] = '\0';
-
+ strlcpy(m->desc, l, sizeof(m->desc));
return 0;
}