[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c trunk/ext/mysqlnd/mysqlnd_loaddata.c

[Andrey Hristov]

andrey   Tue, 01 Feb 2011 19:30:22 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307931

Log:
Fix more warnings about size_t

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 
19:03:05 UTC (rev 307930)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 
19:30:22 UTC (rev 307931)
@@ -212,7 +212,7 @@

/* read data */
while ((bufsize = infile.local_infile_read (info, buf + 
MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) {
-   if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) < 
0) {
+   if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) == 
0) {
DBG_ERR_FMT("Error during read : %d %s %s", 
CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
@@ -220,7 +220,7 @@
}

/* send empty packet for eof */
-   if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) < 0) {
+   if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) == 0) {
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c2011-02-01 19:03:05 UTC 
(rev 307930)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c2011-02-01 19:30:22 UTC 
(rev 307931)
@@ -212,7 +212,7 @@

/* read data */
while ((bufsize = infile.local_infile_read (info, buf + 
MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) {
-   if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) < 
0) {
+   if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) == 
0) {
DBG_ERR_FMT("Error during read : %d %s %s", 
CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
@@ -220,7 +220,7 @@
}

/* send empty packet for eof */
-   if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) < 0) {
+   if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) == 0) {
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c trunk/ext/mysqlnd/mysqlnd_loaddata.c

[Andrey Hristov]

andrey   Mon, 31 May 2010 17:09:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=26

Log:
Bail if allocation fails

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2010-05-31 
16:53:33 UTC (rev 25)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2010-05-31 
17:09:13 UTC (rev 26)
@@ -53,7 +53,12 @@

DBG_ENTER("mysqlnd_local_infile_init");

-   *ptr = info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, 
sizeof(MYSQLND_INFILE_INFO)));
+   info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, 
sizeof(MYSQLND_INFILE_INFO)));
+   if (!info) {
+   DBG_RETURN(1);
+   }
+
+   *ptr = info;

/* check open_basedir */
if (PG(open_basedir)) {

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c2010-05-31 16:53:33 UTC 
(rev 25)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c2010-05-31 17:09:13 UTC 
(rev 26)
@@ -53,7 +53,12 @@

DBG_ENTER("mysqlnd_local_infile_init");

-   *ptr = info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, 
sizeof(MYSQLND_INFILE_INFO)));
+   info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, 
sizeof(MYSQLND_INFILE_INFO)));
+   if (!info) {
+   DBG_RETURN(1);
+   }
+
+   *ptr = info;

/* check open_basedir */
if (PG(open_basedir)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php