CVS update: php3/functions
| From: | steffann | Date: | Fri, 12 Feb 1999 16:03:44 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4070@lists.php.net to get a copy of this message | ||
Date: Friday February 12, 1999 @ 11:03
Author: steffann
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv16887
Modified Files:
info.c
Log Message:
Add some checks in phpinfo() for NULL values. They can cause a segfault.
Index: php3/functions/info.c
diff -c php3/functions/info.c:1.72 php3/functions/info.c:1.73
*** php3/functions/info.c:1.72 Wed Jan 27 16:55:54 1999
--- php3/functions/info.c Fri Feb 12 11:03:43 1999
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: info.c,v 1.72 1999/01/27 21:55:54 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: info.c,v 1.73 1999/02/12 16:03:43 steffann Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 337,345 ****
PUTS("<tr><th bgcolor=\"" HEADER_COLOR
"\">Variable</th><th bgcolor=\"" HEADER_COLOR
"\">Value</th></tr>\n");
for (i=0; i < arr->nelts; i++) {
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">");
! PUTS(elts[i].key);
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">");
! PUTS(elts[i].val);
PUTS(" </td></tr>\n");
}
PUTS("</table>\n");
--- 337,345 ----
PUTS("<tr><th bgcolor=\"" HEADER_COLOR
"\">Variable</th><th bgcolor=\"" HEADER_COLOR
"\">Value</th></tr>\n");
for (i=0; i < arr->nelts; i++) {
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">");
! if (elts[i].key) PUTS(elts[i].key);
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">");
! if (elts[i].val) PUTS(elts[i].val);
PUTS(" </td></tr>\n");
}
PUTS("</table>\n");
***************
*** 365,371 ****
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">");
PUTS(env[i].key);
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">");
! PUTS(env[i].val);
PUTS(" </td></tr>\n");
}
}
--- 365,371 ----
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">");
PUTS(env[i].key);
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">");
! if (env[i].val) PUTS(env[i].val);
PUTS(" </td></tr>\n");
}
}
***************
*** 377,383 ****
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">");
PUTS(env[i].key);
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">");
! PUTS(env[i].val);
PUTS(" </td></tr>\n");
}
}
--- 377,383 ----
PUTS("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">");
PUTS(env[i].key);
PUTS("</td><td bgcolor=\"" CONTENTS_COLOR "\">");
! if (env[i].val) PUTS(env[i].val);
PUTS(" </td></tr>\n");
}
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net