iliaa Mon, 08 Aug 2011 00:07:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314451
Log:
Avoid strcpy() usage
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re
U php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c
U php/php-src/branches/PHP_5_4/ext/pdo/pdo_sql_parser.re
U php/php-src/branches/PHP_5_4/ext/pdo_sqlite/sqlite_driver.c
U php/php-src/trunk/ext/pdo/pdo_sql_parser.re
U php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re 2011-08-07
23:46:00 UTC (rev 314450)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_sql_parser.re 2011-08-08
00:07:54 UTC (rev 314451)
@@ -213,7 +213,7 @@
param->param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt->error_code, stmt->dbh->error_code);
+
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
if (buf) {
efree(buf);
}
@@ -254,7 +254,7 @@
param->param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt->error_code, stmt->dbh->error_code);
+
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
goto clean_up;
}
plc->freeq = 1;
Modified: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c 2011-08-07
23:46:00 UTC (rev 314450)
+++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c 2011-08-08
00:07:54 UTC (rev 314451)
@@ -47,33 +47,33 @@
}
einfo->errmsg = pestrdup((char*)sqlite3_errmsg(H->db),
dbh->is_persistent);
} else { /* no error */
- strcpy(*pdo_err, PDO_ERR_NONE);
+ strncpy(*pdo_err, PDO_ERR_NONE, sizeof(PDO_ERR_NONE));
return 0;
}
switch (einfo->errcode) {
case SQLITE_NOTFOUND:
- strcpy(*pdo_err, "42S02");
+ strncpy(*pdo_err, "42S02", sizeof("42S02"));
break;
case SQLITE_INTERRUPT:
- strcpy(*pdo_err, "01002");
+ strncpy(*pdo_err, "01002", sizeof("01002"));
break;
case SQLITE_NOLFS:
- strcpy(*pdo_err, "HYC00");
+ strncpy(*pdo_err, "HYC00", sizeof("HYC00"));
break;
case SQLITE_TOOBIG:
- strcpy(*pdo_err, "22001");
+ strncpy(*pdo_err, "22001", sizeof("22001"));
break;
case SQLITE_CONSTRAINT:
- strcpy(*pdo_err, "23000");
+ strncpy(*pdo_err, "23000", sizeof("23000"));
break;
case SQLITE_ERROR:
default:
- strcpy(*pdo_err, "HY000");
+ strncpy(*pdo_err, "HY000", sizeof("HY000"));
break;
}
Modified: php/php-src/branches/PHP_5_4/ext/pdo/pdo_sql_parser.re
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo/pdo_sql_parser.re 2011-08-07
23:46:00 UTC (rev 314450)
+++ php/php-src/branches/PHP_5_4/ext/pdo/pdo_sql_parser.re 2011-08-08
00:07:54 UTC (rev 314451)
@@ -213,7 +213,7 @@
param->param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt->error_code, stmt->dbh->error_code);
+
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
if (buf) {
efree(buf);
}
@@ -254,7 +254,7 @@
param->param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt->error_code, stmt->dbh->error_code);
+
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
goto clean_up;
}
plc->freeq = 1;
Modified: php/php-src/branches/PHP_5_4/ext/pdo_sqlite/sqlite_driver.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_sqlite/sqlite_driver.c 2011-08-07
23:46:00 UTC (rev 314450)
+++ php/php-src/branches/PHP_5_4/ext/pdo_sqlite/sqlite_driver.c 2011-08-08
00:07:54 UTC (rev 314451)
@@ -47,33 +47,33 @@
}
einfo->errmsg = pestrdup((char*)sqlite3_errmsg(H->db),
dbh->is_persistent);
} else { /* no error */
- strcpy(*pdo_err, PDO_ERR_NONE);
+ strncpy(*pdo_err, PDO_ERR_NONE, sizeof(PDO_ERR_NONE));
return 0;
}
switch (einfo->errcode) {
case SQLITE_NOTFOUND:
- strcpy(*pdo_err, "42S02");
+ strncpy(*pdo_err, "42S02", sizeof("42S02"));
break;
case SQLITE_INTERRUPT:
- strcpy(*pdo_err, "01002");
+ strncpy(*pdo_err, "01002", sizeof("01002"));
break;
case SQLITE_NOLFS:
- strcpy(*pdo_err, "HYC00");
+ strncpy(*pdo_err, "HYC00", sizeof("HYC00"));
break;
case SQLITE_TOOBIG:
- strcpy(*pdo_err, "22001");
+ strncpy(*pdo_err, "22001", sizeof("22001"));
break;
case SQLITE_CONSTRAINT:
- strcpy(*pdo_err, "23000");
+ strncpy(*pdo_err, "23000", sizeof("23000"));
break;
case SQLITE_ERROR:
default:
- strcpy(*pdo_err, "HY000");
+ strncpy(*pdo_err, "HY000", sizeof("HY000"));
break;
}
Modified: php/php-src/trunk/ext/pdo/pdo_sql_parser.re
===================================================================
--- php/php-src/trunk/ext/pdo/pdo_sql_parser.re 2011-08-07 23:46:00 UTC (rev
314450)
+++ php/php-src/trunk/ext/pdo/pdo_sql_parser.re 2011-08-08 00:07:54 UTC (rev
314451)
@@ -213,7 +213,7 @@
param->param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt->error_code, stmt->dbh->error_code);
+
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
if (buf) {
efree(buf);
}
@@ -254,7 +254,7 @@
param->param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt->error_code, stmt->dbh->error_code);
+
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
goto clean_up;
}
plc->freeq = 1;
Modified: php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c
===================================================================
--- php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c 2011-08-07 23:46:00 UTC
(rev 314450)
+++ php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c 2011-08-08 00:07:54 UTC
(rev 314451)
@@ -47,33 +47,33 @@
}
einfo->errmsg = pestrdup((char*)sqlite3_errmsg(H->db),
dbh->is_persistent);
} else { /* no error */
- strcpy(*pdo_err, PDO_ERR_NONE);
+ strncpy(*pdo_err, PDO_ERR_NONE, sizeof(PDO_ERR_NONE));
return 0;
}
switch (einfo->errcode) {
case SQLITE_NOTFOUND:
- strcpy(*pdo_err, "42S02");
+ strncpy(*pdo_err, "42S02", sizeof("42S02"));
break;
case SQLITE_INTERRUPT:
- strcpy(*pdo_err, "01002");
+ strncpy(*pdo_err, "01002", sizeof("01002"));
break;
case SQLITE_NOLFS:
- strcpy(*pdo_err, "HYC00");
+ strncpy(*pdo_err, "HYC00", sizeof("HYC00"));
break;
case SQLITE_TOOBIG:
- strcpy(*pdo_err, "22001");
+ strncpy(*pdo_err, "22001", sizeof("22001"));
break;
case SQLITE_CONSTRAINT:
- strcpy(*pdo_err, "23000");
+ strncpy(*pdo_err, "23000", sizeof("23000"));
break;
case SQLITE_ERROR:
default:
- strcpy(*pdo_err, "HY000");
+ strncpy(*pdo_err, "HY000", sizeof("HY000"));
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
