wez Sun Mar 7 16:36:55 2004 EDT Modified files: /php-src/main/streams streams.c Log: Less magic please http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.50&r2=1.51&ty=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.50 php-src/main/streams/streams.c:1.51 --- php-src/main/streams/streams.c:1.50 Mon Mar 1 02:02:23 2004 +++ php-src/main/streams/streams.c Sun Mar 7 16:36:55 2004 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.50 2004/03/01 07:02:23 jon Exp $ */ +/* $Id: streams.c,v 1.51 2004/03/07 21:36:55 wez Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -1881,7 +1881,10 @@ vector = (php_stream_dirent **) erealloc(vector, vector_size * sizeof(php_stream_dirent *)); } - vector[nfiles++] = (php_stream_dirent*)estrndup((const char *)&sdp, sizeof(php_stream_dirent) + ((strlen(sdp.d_name) + 1) * sizeof(char))); + vector[nfiles] = emalloc(sizeof(php_stream_dirent)); + memcpy(vector[nfiles], &sdp, sizeof(sdp)); + + nfiles++; } php_stream_closedir(stream);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php