diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:27 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:27 -0400 |
| commit | 2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b (patch) | |
| tree | 41ccc042009cba53e4ce43e727fcba4c1cfbf7f3 /ext/msql | |
| parent | d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76 (diff) | |
| download | php-upstream/5.2.2.tar.gz | |
Imported Upstream version 5.2.2upstream/5.2.2
Diffstat (limited to 'ext/msql')
| -rw-r--r-- | ext/msql/php_msql.c | 8 | ||||
| -rw-r--r-- | ext/msql/php_msql.h | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index 7d328fdf0..47d2baf87 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2006 The PHP Group | + | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.60.2.4 2006/01/01 12:50:09 sniper Exp $ */ +/* $Id: php_msql.c,v 1.60.2.4.2.2 2007/02/24 02:17:25 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -250,9 +250,7 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) } convert_to_string(yyhost); host = Z_STRVAL_P(yyhost); - hashed_details_length = Z_STRLEN_P(yyhost)+4+1; - hashed_details = emalloc(hashed_details_length+1); - sprintf(hashed_details,"msql_%s",Z_STRVAL_P(yyhost)); /* SAFE */ + hashed_details_length = spprintf(&hashed_details, 0, "msql_%s",Z_STRVAL_P(yyhost)); } break; default: diff --git a/ext/msql/php_msql.h b/ext/msql/php_msql.h index eb5a2a815..ecbdcd41b 100644 --- a/ext/msql/php_msql.h +++ b/ext/msql/php_msql.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2006 The PHP Group | + | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.h,v 1.13.2.1 2006/01/01 12:50:09 sniper Exp $ */ +/* $Id: php_msql.h,v 1.13.2.1.2.1 2007/01/01 09:36:03 sebastian Exp $ */ #ifndef PHP_MSQL_H #define PHP_MSQL_H |