AST-2009-005

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@211539 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 10 insertions, 10 deletions

diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index 1d3199114..606506db9 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -460,7 +460,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_TYPE_DATE:
 					{
 						int year = 0, month = 0, day = 0;
-						if (sscanf(colptr, "%d-%d-%d", &year, &month, &day) != 3 || year <= 0 ||
+						if (sscanf(colptr, "%4d-%2d-%2d", &year, &month, &day) != 3 || year <= 0 ||
 							month <= 0 || month > 12 || day < 0 || day > 31 ||
 							((month == 4 || month == 6 || month == 9 || month == 11) && day == 31) ||
 							(month == 2 && year % 400 == 0 && day > 29) ||
@@ -483,7 +483,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_TYPE_TIME:
 					{
 						int hour = 0, minute = 0, second = 0;
-						int count = sscanf(colptr, "%d:%d:%d", &hour, &minute, &second);
+						int count = sscanf(colptr, "%2d:%2d:%2d", &hour, &minute, &second);
 
 						if ((count != 2 && count != 3) || hour < 0 || hour > 23 || minute < 0 || minute > 59 || second < 0 || second > 59) {
 							ast_log(LOG_WARNING, "CDR variable %s is not a valid time ('%s').\n", entry->name, colptr);
@@ -499,7 +499,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_TIMESTAMP:
 					{
 						int year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
-						int count = sscanf(colptr, "%d-%d-%d %d:%d:%d", &year, &month, &day, &hour, &minute, &second);
+						int count = sscanf(colptr, "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &minute, &second);
 
 						if ((count != 3 && count != 5 && count != 6) || year <= 0 ||
 							month <= 0 || month > 12 || day < 0 || day > 31 ||
@@ -525,7 +525,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_INTEGER:
 					{
 						int integer = 0;
-						if (sscanf(colptr, "%d", &integer) != 1) {
+						if (sscanf(colptr, "%30d", &integer) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
 							continue;
 						}
@@ -538,7 +538,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_BIGINT:
 					{
 						long long integer = 0;
-						if (sscanf(colptr, "%lld", &integer) != 1) {
+						if (sscanf(colptr, "%30lld", &integer) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
 							continue;
 						}
@@ -551,7 +551,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_SMALLINT:
 					{
 						short integer = 0;
-						if (sscanf(colptr, "%hd", &integer) != 1) {
+						if (sscanf(colptr, "%30hd", &integer) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
 							continue;
 						}
@@ -564,7 +564,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_TINYINT:
 					{
 						char integer = 0;
-						if (sscanf(colptr, "%hhd", &integer) != 1) {
+						if (sscanf(colptr, "%30hhd", &integer) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
 							continue;
 						}
@@ -577,7 +577,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_BIT:
 					{
 						char integer = 0;
-						if (sscanf(colptr, "%hhd", &integer) != 1) {
+						if (sscanf(colptr, "%30hhd", &integer) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
 							continue;
 						}
@@ -593,7 +593,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_DECIMAL:
 					{
 						double number = 0.0;
-						if (sscanf(colptr, "%lf", &number) != 1) {
+						if (sscanf(colptr, "%30lf", &number) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an numeric type.\n", entry->name);
 							continue;
 						}
@@ -608,7 +608,7 @@ static int odbc_log(struct ast_cdr *cdr)
 				case SQL_DOUBLE:
 					{
 						double number = 0.0;
-						if (sscanf(colptr, "%lf", &number) != 1) {
+						if (sscanf(colptr, "%30lf", &number) != 1) {
 							ast_log(LOG_WARNING, "CDR variable %s is not an numeric type.\n", entry->name);
 							continue;
 						}