summaryrefslogtreecommitdiff
path: root/backport-CVE-2024-11053-post1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'backport-CVE-2024-11053-post1.patch')
-rw-r--r--backport-CVE-2024-11053-post1.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/backport-CVE-2024-11053-post1.patch b/backport-CVE-2024-11053-post1.patch
new file mode 100644
index 0000000..1d69ba5
--- /dev/null
+++ b/backport-CVE-2024-11053-post1.patch
@@ -0,0 +1,37 @@
+From 4b07b7ebadfbff1d26622719b9048673a78f0bf0 Mon Sep 17 00:00:00 2001
+From: Viktor Szakats <commit@vsz.me>
+Date: Sun, 17 Nov 2024 12:46:25 +0100
+Subject: [PATCH] netrc: fix pointer to bool conversion
+
+with MSVC 2008 and 2010:
+```
+lib/netrc.c(107): error C2440: 'initializing' : cannot convert from 'char *' to 'bool'
+```
+Ref: https://ci.appveyor.com/project/curlorg/curl/builds/51002792/job/jtoxd4mk984oi6fd#L164
+Ref: https://ci.appveyor.com/project/curlorg/curl/builds/51002792/job/0wxlw9a8g04e56vt#L177
+
+Follow-up to e9b9bbac22c26cf67316fa8e6c6b9e831af31949 #15586
+Closes #15601
+
+Conflict:NA
+Reference:https://github.com/curl/curl/commit/4b07b7ebadfbff1d26622719b9048673a78f0bf0
+---
+ lib/netrc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/netrc.c b/lib/netrc.c
+index e787a6ffc..d5ee3c0fd 100644
+--- a/lib/netrc.c
++++ b/lib/netrc.c
+@@ -104,7 +104,7 @@ static int parsenetrc(struct store_netrc *store,
+ int retcode = NETRC_FILE_MISSING;
+ char *login = *loginp;
+ char *password = NULL;
+- bool specific_login = login; /* points to something */
++ bool specific_login = !!login; /* points to something */
+ enum host_lookup_state state = NOTHING;
+ enum found_state keyword = NONE;
+ unsigned char found = 0; /* login + password found bits, as they can come in
+--
+2.33.0
+