--- embedaddon/php/ext/pdo_odbc/odbc_stmt.c 2013/10/14 08:02:28 1.1.1.4 +++ embedaddon/php/ext/pdo_odbc/odbc_stmt.c 2014/06/15 20:03:53 1.1.1.5 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: odbc_stmt.c,v 1.1.1.4 2013/10/14 08:02:28 misho Exp $ */ +/* $Id: odbc_stmt.c,v 1.1.1.5 2014/06/15 20:03:53 misho Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -472,7 +472,7 @@ static int odbc_stmt_param_hook(pdo_stmt_t *stmt, stru if (P->outbuf) { unsigned long ulen; char *srcbuf; - unsigned long srclen; + unsigned long srclen = 0; switch (P->len) { case SQL_NULL_DATA: @@ -551,7 +551,8 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int co struct pdo_column_data *col = &stmt->columns[colno]; RETCODE rc; SWORD colnamelen; - SDWORD colsize, displaysize; + SDWORD colsize; + SQLLEN displaysize; rc = SQLDescribeCol(S->stmt, colno+1, S->cols[colno].colname, sizeof(S->cols[colno].colname)-1, &colnamelen,