From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/unixODBC/files/
Date: Sun, 22 Mar 2020 20:41:35 +0000 (UTC) [thread overview]
Message-ID: <1584909642.e14cdf830a18d8131293545eec9b658d08acfdfd.asturm@gentoo> (raw)
commit: e14cdf830a18d8131293545eec9b658d08acfdfd
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Mar 22 18:52:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 20:40:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14cdf83
dev-db/unixODBC: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15060
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/unixODBC-2.3.5-CVE-2018-7485.patch | 135 ---------------------
1 file changed, 135 deletions(-)
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch b/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch
deleted file mode 100644
index 2c4178cda48..00000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 45ef78e037f578b15fc58938a3a3251655e71d6f Mon Sep 17 00:00:00 2001
-From: Nick Gorham <nick@lurcher.ink.org>
-Date: Mon, 8 Jan 2018 11:12:39 +0000
-Subject: [PATCH] New Pre Source
-
-diff --git a/DriverManager/SQLGetDiagRecW.c b/DriverManager/SQLGetDiagRecW.c
-index a6368d7..be89120 100644
---- a/DriverManager/SQLGetDiagRecW.c
-+++ b/DriverManager/SQLGetDiagRecW.c
-@@ -98,6 +98,8 @@
-
- static char const rcsid[]= "$RCSfile: SQLGetDiagRecW.c,v $";
-
-+extern int __is_env( EHEAD * head ); /* in SQLGetDiagRec.c */
-+
- static SQLRETURN extract_sql_error_rec_w( EHEAD *head,
- SQLWCHAR *sqlstate,
- SQLINTEGER rec_number,
-diff --git a/DriverManager/SQLSetDescField.c b/DriverManager/SQLSetDescField.c
-index 333d786..0e2f67c 100644
---- a/DriverManager/SQLSetDescField.c
-+++ b/DriverManager/SQLSetDescField.c
-@@ -306,7 +306,7 @@ SQLRETURN SQLSetDescField( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_COUNT && (SQLINTEGER)value < 0 )
-+ if ( field_identifier == SQL_DESC_COUNT && (intptr_t)value < 0 )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_07009, NULL,
-@@ -315,9 +315,9 @@ SQLRETURN SQLSetDescField( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_PARAMETER_TYPE && value != SQL_PARAM_INPUT
-- && value != SQL_PARAM_OUTPUT && value != SQL_PARAM_INPUT_OUTPUT &&
-- value != SQL_PARAM_INPUT_OUTPUT_STREAM && value != SQL_PARAM_OUTPUT_STREAM )
-+ if ( field_identifier == SQL_DESC_PARAMETER_TYPE && (intptr_t)value != SQL_PARAM_INPUT
-+ && (intptr_t)value != SQL_PARAM_OUTPUT && (intptr_t)value != SQL_PARAM_INPUT_OUTPUT &&
-+ (intptr_t)value != SQL_PARAM_INPUT_OUTPUT_STREAM && (intptr_t)value != SQL_PARAM_OUTPUT_STREAM )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_HY105, NULL,
-diff --git a/DriverManager/SQLSetDescFieldW.c b/DriverManager/SQLSetDescFieldW.c
-index 5e066ac..45125ff 100644
---- a/DriverManager/SQLSetDescFieldW.c
-+++ b/DriverManager/SQLSetDescFieldW.c
-@@ -288,7 +288,7 @@ SQLRETURN SQLSetDescFieldW( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_COUNT && (SQLINTEGER)value < 0 )
-+ if ( field_identifier == SQL_DESC_COUNT && (intptr_t)value < 0 )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_07009, NULL,
-@@ -297,9 +297,9 @@ SQLRETURN SQLSetDescFieldW( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_PARAMETER_TYPE && value != SQL_PARAM_INPUT
-- && value != SQL_PARAM_OUTPUT && value != SQL_PARAM_INPUT_OUTPUT &&
-- value != SQL_PARAM_INPUT_OUTPUT_STREAM && value != SQL_PARAM_OUTPUT_STREAM )
-+ if ( field_identifier == SQL_DESC_PARAMETER_TYPE && (intptr_t)value != SQL_PARAM_INPUT
-+ && (intptr_t)value != SQL_PARAM_OUTPUT && (intptr_t)value != SQL_PARAM_INPUT_OUTPUT &&
-+ (intptr_t)value != SQL_PARAM_INPUT_OUTPUT_STREAM && (intptr_t)value != SQL_PARAM_OUTPUT_STREAM )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_HY105, NULL,
-diff --git a/exe/iusql.c b/exe/iusql.c
-index aac5329..484a889 100644
---- a/exe/iusql.c
-+++ b/exe/iusql.c
-@@ -413,7 +413,6 @@ static int ExecuteSQL( SQLHDBC hDbc, char *szSQL, char cDelimiter, int bColumnNa
- if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
- fprintf( stderr, "[ISQL]ERROR: Could not SQLExecDirect\n" );
- SQLFreeStmt( hStmt, SQL_DROP );
-- free(szSepLine);
- return 0;
- }
- }
-diff --git a/odbcinst/SQLCreateDataSource.c b/odbcinst/SQLCreateDataSource.c
-index a9fa735..83a1e9e 100644
---- a/odbcinst/SQLCreateDataSource.c
-+++ b/odbcinst/SQLCreateDataSource.c
-@@ -26,7 +26,7 @@ char* _multi_string_alloc_and_copy( LPCWSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 || in[ len + 1 ] != 0 )
-@@ -55,7 +55,7 @@ char* _single_string_alloc_and_copy( LPCWSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 )
-@@ -83,7 +83,7 @@ SQLWCHAR* _multi_string_alloc_and_expand( LPCSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 || in[ len + 1 ] != 0 )
-@@ -112,7 +112,7 @@ SQLWCHAR* _single_string_alloc_and_expand( LPCSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 )
-diff --git a/odbcinst/SQLWriteFileDSN.c b/odbcinst/SQLWriteFileDSN.c
-index c2f987b..e225796 100644
---- a/odbcinst/SQLWriteFileDSN.c
-+++ b/odbcinst/SQLWriteFileDSN.c
-@@ -21,7 +21,7 @@ BOOL SQLWriteFileDSN( LPCSTR pszFileName,
-
- if ( pszFileName[0] == '/' )
- {
-- strncpy( szFileName, sizeof(szFileName) - 5, pszFileName );
-+ strncpy( szFileName, pszFileName, sizeof(szFileName) - 5 );
- }
- else
- {
reply other threads:[~2020-03-22 20:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1584909642.e14cdf830a18d8131293545eec9b658d08acfdfd.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox