fix CVE-2024-1013

This commit is contained in:
蒋宏博
2024-03-19 17:15:33 +08:00
parent 8e6f45dbd5
commit 8d21ce471a
3 changed files with 32 additions and 2 deletions

View File

@ -104,7 +104,7 @@ while [ $# -gt 0 ]; do
serverlib_dir=$2 serverlib_dir=$2
shift 2 shift 2
;; ;;
-ud|--unixodbc_dir) -ud|--unixodbc_dir)
if [ "$2"X = X ]; then if [ "$2"X = X ]; then
echo "no given unixodbc directory values" echo "no given unixodbc directory values"
exit 1 exit 1

View File

@ -0,0 +1,29 @@
diff -Naur a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c
--- a/Drivers/Postgre7.1/info.c 2024-03-19 15:43:10.523054234 +0800
+++ b/Drivers/Postgre7.1/info.c 2024-03-19 15:56:31.788491940 +0800
@@ -1779,14 +1779,14 @@
char index_name[MAX_INFO_STRING];
short fields_vector[8];
char isunique[10], isclustered[10];
-SDWORD index_name_len, fields_vector_len;
+SQLLEN index_name_len, fields_vector_len;
TupleNode *row;
int i;
HSTMT hcol_stmt;
StatementClass *col_stmt, *indx_stmt;
char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
char **column_names = 0;
-Int4 column_name_len;
+SQLLEN column_name_len;
int total_columns = 0;
char error = TRUE;
ConnInfo *ci;
@@ -2136,7 +2136,7 @@
StatementClass *tbl_stmt;
char tables_query[STD_STATEMENT_LEN];
char attname[MAX_INFO_STRING];
-SDWORD attname_len;
+SQLLEN
char pktab[MAX_TABLE_LEN + 1];
Int2 result_cols;

View File

@ -92,6 +92,7 @@ function build_component()
die "[Error] change dir to $SRC_DIR failed." die "[Error] change dir to $SRC_DIR failed."
fi fi
patch -p1 < ../CVE-2024-1013.patch
log "[Notice] start autoreconf." log "[Notice] start autoreconf."
autoreconf -fi autoreconf -fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then