Skip to content

Commit

Permalink
Improve limits check
Browse files Browse the repository at this point in the history
  • Loading branch information
@babelouest
babelouest committed Dec 30, 2023
1 parent 5c026aa commit 2467fce
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 38 deletions.
80 changes: 47 additions & 33 deletions src/hoel-pgsql.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,37 +97,45 @@ struct _h_connection * h_connect_pgsql(const char * conninfo) {
conn = NULL;
} else {
ntuples = PQntuples(res);
((struct _h_pgsql *)conn->connection)->list_type = o_malloc(((size_t)ntuples+1)*sizeof(struct _h_pg_type));
if (((struct _h_pgsql *)conn->connection)->list_type != NULL) {
((struct _h_pgsql *)conn->connection)->nb_type = (unsigned int)ntuples;
for(i = 0; i < ntuples; i++) {
char * cur_type_name = PQgetvalue(res, i, 1);
((struct _h_pgsql *)conn->connection)->list_type[i].pg_type = (Oid)strtol(PQgetvalue(res, i, 0), NULL, 10);
if (o_strcmp(cur_type_name, "bool") == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_BOOL;
} else if (o_strncmp(cur_type_name, "int", 3) == 0 || (o_strncmp(cur_type_name+1, "id", 2) == 0 && o_strlen(cur_type_name) == 3)) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_INT;
} else if (o_strcmp(cur_type_name, "numeric") == 0 || o_strncmp(cur_type_name, "float", 5) == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_DOUBLE;
} else if (o_strcmp(cur_type_name, "date") == 0 || o_strncmp(cur_type_name, "time", 4) == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_DATE;
} else if (o_strcmp(cur_type_name, "bytea") == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_BLOB;
} else if (o_strcmp(cur_type_name, "bool") == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_BOOL;
} else {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_TEXT;
if (ntuples >= 0) {
((struct _h_pgsql *)conn->connection)->list_type = o_malloc(((size_t)ntuples+1)*sizeof(struct _h_pg_type));
if (((struct _h_pgsql *)conn->connection)->list_type != NULL) {
((struct _h_pgsql *)conn->connection)->nb_type = (unsigned int)ntuples;
for(i = 0; i < ntuples; i++) {
char * cur_type_name = PQgetvalue(res, i, 1);
((struct _h_pgsql *)conn->connection)->list_type[i].pg_type = (Oid)strtol(PQgetvalue(res, i, 0), NULL, 10);
if (o_strcmp(cur_type_name, "bool") == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_BOOL;
} else if (o_strncmp(cur_type_name, "int", 3) == 0 || (o_strncmp(cur_type_name+1, "id", 2) == 0 && o_strlen(cur_type_name) == 3)) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_INT;
} else if (o_strcmp(cur_type_name, "numeric") == 0 || o_strncmp(cur_type_name, "float", 5) == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_DOUBLE;
} else if (o_strcmp(cur_type_name, "date") == 0 || o_strncmp(cur_type_name, "time", 4) == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_DATE;
} else if (o_strcmp(cur_type_name, "bytea") == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_BLOB;
} else if (o_strcmp(cur_type_name, "bool") == 0) {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_BOOL;
} else {
((struct _h_pgsql *)conn->connection)->list_type[i].h_type = HOEL_COL_TYPE_TEXT;
}
}
/* Initialize MUTEX for connection */
pthread_mutexattr_init ( &mutexattr );
pthread_mutexattr_settype( &mutexattr, PTHREAD_MUTEX_RECURSIVE );
if (pthread_mutex_init(&(((struct _h_pgsql *)conn->connection)->lock), &mutexattr) != 0) {
y_log_message(Y_LOG_LEVEL_ERROR, "Impossible to initialize Mutex Lock for PostgreSQL connection");
}
pthread_mutexattr_destroy( &mutexattr );
} else {
y_log_message(Y_LOG_LEVEL_ERROR, "Error allocating resources for list_type");
PQfinish(((struct _h_pgsql *)conn->connection)->db_handle);
h_free(conn->connection);
h_free(conn);
conn = NULL;
}
/* Initialize MUTEX for connection */
pthread_mutexattr_init ( &mutexattr );
pthread_mutexattr_settype( &mutexattr, PTHREAD_MUTEX_RECURSIVE );
if (pthread_mutex_init(&(((struct _h_pgsql *)conn->connection)->lock), &mutexattr) != 0) {
y_log_message(Y_LOG_LEVEL_ERROR, "Impossible to initialize Mutex Lock for PostgreSQL connection");
}
pthread_mutexattr_destroy( &mutexattr );
} else {
y_log_message(Y_LOG_LEVEL_ERROR, "Error allocating resources for list_type");
y_log_message(Y_LOG_LEVEL_ERROR, "Error PQntuples");
PQfinish(((struct _h_pgsql *)conn->connection)->db_handle);
h_free(conn->connection);
h_free(conn);
Expand Down Expand Up @@ -203,7 +211,7 @@ static unsigned short h_get_type_from_oid(const struct _h_connection * conn, Oid
*/
int h_execute_query_pgsql(const struct _h_connection * conn, const char * query, struct _h_result * result) {
PGresult * res;
int nfields, ntuples, i, j, h_res, ret = H_OK;
int nfields, ntuples, i, j, h_res, ret = H_OK, nlength;
struct _h_data * data, * cur_row = NULL;

if (pthread_mutex_lock(&(((struct _h_pgsql *)conn->connection)->lock))) {
Expand Down Expand Up @@ -239,7 +247,9 @@ int h_execute_query_pgsql(const struct _h_connection * conn, const char * query,
data = h_new_data_double(strtod(val, NULL));
break;
case HOEL_COL_TYPE_BLOB:
data = h_new_data_blob(val, (size_t)PQgetlength(res, i, j));
if ((nlength = PQgetlength(res, i, j)) >= 0) {
data = h_new_data_blob(val, (size_t)nlength);
}
break;
case HOEL_COL_TYPE_BOOL:
if (o_strcasecmp(val, "t") == 0) {
Expand All @@ -253,7 +263,9 @@ int h_execute_query_pgsql(const struct _h_connection * conn, const char * query,
case HOEL_COL_TYPE_DATE:
case HOEL_COL_TYPE_TEXT:
default:
data = h_new_data_text(val, (size_t)PQgetlength(res, i, j));
if ((nlength = PQgetlength(res, i, j)) >= 0) {
data = h_new_data_text(val, (size_t)nlength);
}
break;
}
}
Expand Down Expand Up @@ -286,7 +298,7 @@ int h_execute_query_pgsql(const struct _h_connection * conn, const char * query,
*/
int h_execute_query_json_pgsql(const struct _h_connection * conn, const char * query, json_t ** j_result) {
PGresult *res;
int nfields, ntuples, i, j, ret = H_OK;
int nfields, ntuples, i, j, ret = H_OK, nlength;
json_t * j_data;

if (pthread_mutex_lock(&(((struct _h_pgsql *)conn->connection)->lock))) {
Expand Down Expand Up @@ -331,7 +343,9 @@ int h_execute_query_json_pgsql(const struct _h_connection * conn, const char * q
json_object_set_new(j_data, PQfname(res, j), json_real(strtod(PQgetvalue(res, i, j), NULL)));
break;
case HOEL_COL_TYPE_BLOB:
json_object_set_new(j_data, PQfname(res, j), json_stringn(PQgetvalue(res, i, j), (size_t)PQgetlength(res, i, j)));
if ((nlength = PQgetlength(res, i, j)) >= 0) {
json_object_set_new(j_data, PQfname(res, j), json_stringn(PQgetvalue(res, i, j), (size_t)nlength));
}
break;
case HOEL_COL_TYPE_BOOL:
if (o_strcasecmp(PQgetvalue(res, i, j), "t") == 0) {
Expand Down
16 changes: 11 additions & 5 deletions src/hoel-sqlite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ long long int h_last_insert_id_sqlite(const struct _h_connection * conn) {
*/
int h_select_query_sqlite(const struct _h_connection * conn, const char * query, struct _h_result * result) {
sqlite3_stmt *stmt;
int sql_result, row_result, nb_columns, col, row, res;
int sql_result, row_result, nb_columns, col, row, res, col_bytes;
struct _h_data * data = NULL, * cur_row = NULL;

sql_result = sqlite3_prepare_v2(((struct _h_sqlite *)conn->connection)->db_handle, query, (int)o_strlen(query)+1, &stmt, NULL);
Expand All @@ -166,10 +166,14 @@ int h_select_query_sqlite(const struct _h_connection * conn, const char * query,
data = h_new_data_double(sqlite3_column_double(stmt, col));
break;
case SQLITE_BLOB:
data = h_new_data_blob(sqlite3_column_blob(stmt, col), (size_t)sqlite3_column_bytes(stmt, col));
if ((col_bytes = sqlite3_column_bytes(stmt, col)) >= 0) {
data = h_new_data_blob(sqlite3_column_blob(stmt, col), (size_t)col_bytes);
}
break;
case SQLITE3_TEXT:
data = h_new_data_text((char*)sqlite3_column_text(stmt, col), (size_t)sqlite3_column_bytes(stmt, col));
if ((col_bytes = sqlite3_column_bytes(stmt, col)) >= 0) {
data = h_new_data_text((char*)sqlite3_column_text(stmt, col), (size_t)col_bytes);
}
break;
case SQLITE_NULL:
data = h_new_data_null();
Expand Down Expand Up @@ -254,7 +258,7 @@ int h_exec_query_sqlite(const struct _h_connection * conn, const char * query) {
*/
int h_execute_query_json_sqlite(const struct _h_connection * conn, const char * query, json_t ** j_result) {
sqlite3_stmt *stmt;
int sql_result, row_result, nb_columns, col;
int sql_result, row_result, nb_columns, col, col_bytes;
json_t * j_data;

if (j_result == NULL) {
Expand Down Expand Up @@ -289,7 +293,9 @@ int h_execute_query_json_sqlite(const struct _h_connection * conn, const char *
json_object_set_new(j_data, sqlite3_column_name(stmt, col), json_real(sqlite3_column_double(stmt, col)));
break;
case SQLITE_BLOB:
json_object_set_new(j_data, sqlite3_column_name(stmt, col), json_stringn(sqlite3_column_blob(stmt, col), (size_t)sqlite3_column_bytes(stmt, col)));
if ((col_bytes = sqlite3_column_bytes(stmt, col)) >= 0) {
json_object_set_new(j_data, sqlite3_column_name(stmt, col), json_stringn(sqlite3_column_blob(stmt, col), (size_t)col_bytes));
}
break;
case SQLITE3_TEXT:
json_object_set_new(j_data, sqlite3_column_name(stmt, col), json_string((char*)sqlite3_column_text(stmt, col)));
Expand Down

0 comments on commit 2467fce

Please sign in to comment.