Skip to content

chore: replace unsafe string-to-number conversions #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2025
Merged

chore: replace unsafe string-to-number conversions #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d9964
chore: replace unsafe string-to-number conversions
faviansamatha Apr 8, 2025
9e26ed4
modify pgxalib.cpp
faviansamatha Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ CC_set_translation(ConnectionClass *self)
if (self->connInfo.translation_dll[0] == 0)
return TRUE;

self->translation_option = atoi(self->connInfo.translation_option);
self->translation_option = pg_atoi(self->connInfo.translation_option);
self->translation_handle = LoadLibrary(self->connInfo.translation_dll);

if (self->translation_handle == NULL)
Expand Down Expand Up @@ -2082,7 +2082,7 @@ MYLOG(DETAIL_LOG_LEVEL, "Discarded a RELEASE result\n");
{
ptr = strrchr(cmdbuffer, ' ');
if (ptr)
res->recent_processed_row_count = atoi(ptr + 1);
res->recent_processed_row_count = pg_atoi(ptr + 1);
else
res->recent_processed_row_count = -1;
if (self->current_schema_valid &&
Expand Down
6 changes: 3 additions & 3 deletions connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@ do { \
* It must be a decimal constant of the form %d.%d .
*/
#define PG_VERSION_GT(conn, ver) \
(SERVER_VERSION_GT(conn, (int) ver, atoi(STRING_AFTER_DOT(ver))))
(SERVER_VERSION_GT(conn, (int) ver, pg_atoi(STRING_AFTER_DOT(ver))))
#define PG_VERSION_GE(conn, ver) \
(SERVER_VERSION_GE(conn, (int) ver, atoi(STRING_AFTER_DOT(ver))))
(SERVER_VERSION_GE(conn, (int) ver, pg_atoi(STRING_AFTER_DOT(ver))))
#define PG_VERSION_EQ(conn, ver) \
(SERVER_VERSION_EQ(conn, (int) ver, atoi(STRING_AFTER_DOT(ver))))
(SERVER_VERSION_EQ(conn, (int) ver, pg_atoi(STRING_AFTER_DOT(ver))))
#define PG_VERSION_LE(conn, ver) (! PG_VERSION_GT(conn, ver))
#define PG_VERSION_LT(conn, ver) (! PG_VERSION_GE(conn, ver))

Expand Down
42 changes: 21 additions & 21 deletions convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ static SQLLEN pg_bin2whex(const char *src, SQLWCHAR *dst, SQLLEN length);
#elif defined(HAVE_STRTOUL)
#define ATOI32U(val) strtoul(val, NULL, 10)
#else /* HAVE_STRTOUL */
#define ATOI32U atol
#define ATOI32U(val) strtol(val, NULL, 10)
#endif /* WIN32 */

/*
Expand Down Expand Up @@ -334,23 +334,23 @@ timestamp2stime(const char *str, SIMPLE_TIME *st, BOOL *bZone, int *zone)
{
case '+':
*bZone = TRUE;
*zone = atoi(&rest[1]);
*zone = pg_atoi(&rest[1]);
break;
case '-':
*bZone = TRUE;
*zone = -atoi(&rest[1]);
*zone = -pg_atoi(&rest[1]);
break;
case '.':
if ((ptr = strchr(rest, '+')) != NULL)
{
*bZone = TRUE;
*zone = atoi(&ptr[1]);
*zone = pg_atoi(&ptr[1]);
*ptr = '\0';
}
else if ((ptr = strchr(rest, '-')) != NULL)
{
*bZone = TRUE;
*zone = -atoi(&ptr[1]);
*zone = -pg_atoi(&ptr[1]);
*ptr = '\0';
}
for (i = 1; i < 10; i++)
Expand All @@ -361,7 +361,7 @@ timestamp2stime(const char *str, SIMPLE_TIME *st, BOOL *bZone, int *zone)
for (; i < 10; i++)
rest[i] = '0';
rest[i] = '\0';
st->fr = atoi(&rest[1]);
st->fr = pg_atoi(&rest[1]);
break;
case 'B':
if (stricmp(rest, "BC") == 0)
Expand Down Expand Up @@ -563,7 +563,7 @@ static int getPrecisionPart(int precision, const char * precPart)
memcpy(fraction, precPart, cpys);
fraction[precision] = '\0';

return atoi(fraction);
return pg_atoi(fraction);
}

static BOOL
Expand Down Expand Up @@ -849,7 +849,7 @@ static double get_double_value(const char *str)
#else
return (double) -(HUGE_VAL * HUGE_VAL);
#endif /* INFINITY */
return atof(str);
return pg_atof(str);
}

static int char2guid(const char *str, SQLGUID *g)
Expand Down Expand Up @@ -1802,29 +1802,29 @@ MYLOG(DETAIL_LOG_LEVEL, "2stime fr=%d\n", std_time.fr);
case SQL_C_BIT:
len = 1;
if (bind_size > 0)
*((UCHAR *) rgbValueBindRow) = atoi(neut_str);
*((UCHAR *) rgbValueBindRow) = pg_atoi(neut_str);
else
*((UCHAR *) rgbValue + bind_row) = atoi(neut_str);
*((UCHAR *) rgbValue + bind_row) = pg_atoi(neut_str);

MYLOG(99, "SQL_C_BIT: bind_row = " FORMAT_POSIROW " val = %d, cb = " FORMAT_LEN ", rgb=%d\n",
bind_row, atoi(neut_str), cbValueMax, *((UCHAR *)rgbValue));
bind_row, pg_atoi(neut_str), cbValueMax, *((UCHAR *)rgbValue));
break;

case SQL_C_STINYINT:
case SQL_C_TINYINT:
len = 1;
if (bind_size > 0)
*((SCHAR *) rgbValueBindRow) = atoi(neut_str);
*((SCHAR *) rgbValueBindRow) = pg_atoi(neut_str);
else
*((SCHAR *) rgbValue + bind_row) = atoi(neut_str);
*((SCHAR *) rgbValue + bind_row) = pg_atoi(neut_str);
break;

case SQL_C_UTINYINT:
len = 1;
if (bind_size > 0)
*((UCHAR *) rgbValueBindRow) = atoi(neut_str);
*((UCHAR *) rgbValueBindRow) = pg_atoi(neut_str);
else
*((UCHAR *) rgbValue + bind_row) = atoi(neut_str);
*((UCHAR *) rgbValue + bind_row) = pg_atoi(neut_str);
break;

case SQL_C_FLOAT:
Expand Down Expand Up @@ -1865,26 +1865,26 @@ MYLOG(DETAIL_LOG_LEVEL, "2stime fr=%d\n", std_time.fr);
case SQL_C_SHORT:
len = 2;
if (bind_size > 0)
*((SQLSMALLINT *) rgbValueBindRow) = atoi(neut_str);
*((SQLSMALLINT *) rgbValueBindRow) = pg_atoi(neut_str);
else
*((SQLSMALLINT *) rgbValue + bind_row) = atoi(neut_str);
*((SQLSMALLINT *) rgbValue + bind_row) = pg_atoi(neut_str);
break;

case SQL_C_USHORT:
len = 2;
if (bind_size > 0)
*((SQLUSMALLINT *) rgbValueBindRow) = atoi(neut_str);
*((SQLUSMALLINT *) rgbValueBindRow) = pg_atoi(neut_str);
else
*((SQLUSMALLINT *) rgbValue + bind_row) = atoi(neut_str);
*((SQLUSMALLINT *) rgbValue + bind_row) = pg_atoi(neut_str);
break;

case SQL_C_SLONG:
case SQL_C_LONG:
len = 4;
if (bind_size > 0)
*((SQLINTEGER *) rgbValueBindRow) = atol(neut_str);
*((SQLINTEGER *) rgbValueBindRow) = pg_atol(neut_str);
else
*((SQLINTEGER *) rgbValue + bind_row) = atol(neut_str);
*((SQLINTEGER *) rgbValue + bind_row) = pg_atol(neut_str);
break;

case SQL_C_ULONG:
Expand Down
Loading