Attachment 223719 Details for Bug 254667 – Fix crash with libssh2

[patch] Fix crash with libssh2

curl.diff (text/plain), 1.80 KB, created by Jung-uk Kim on 2021-03-30 23:01:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2021-03-30 23:01:42 UTC

Size: 1.80 KB

patch

obsolete

>Index: ftp/curl/Makefile
>===================================================================
>--- ftp/curl/Makefile	(revision 569567)
>+++ ftp/curl/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	curl
> PORTVERSION=	7.75.0
>+PORTREVISION=	1
> CATEGORIES=	ftp net www
> MASTER_SITES=	https://curl.haxx.se/download/ \
> 		LOCAL/sunpoet
>Index: ftp/curl/files/patch-lib_vssh_libssh2.c
>===================================================================
>--- ftp/curl/files/patch-lib_vssh_libssh2.c	(nonexistent)
>+++ ftp/curl/files/patch-lib_vssh_libssh2.c	(working copy)
>@@ -0,0 +1,24 @@
>+--- lib/vssh/libssh2.c.orig	2021-02-02 08:26:24 UTC
>++++ lib/vssh/libssh2.c
>+@@ -184,7 +184,7 @@ kbd_callback(const char *name, int name_len, const cha
>+              LIBSSH2_USERAUTH_KBDINT_RESPONSE *responses,
>+              void **abstract)
>+ {
>+-  struct connectdata *conn = (struct connectdata *)*abstract;
>++  struct Curl_easy *data = (struct Curl_easy *)*abstract;
>+ 
>+ #ifdef CURL_LIBSSH2_DEBUG
>+   fprintf(stderr, "name=%s\n", name);
>+@@ -199,11 +199,11 @@ kbd_callback(const char *name, int name_len, const cha
>+   (void)instruction_len;
>+ #endif  /* CURL_LIBSSH2_DEBUG */
>+   if(num_prompts == 1) {
>++    struct connectdata *conn = data->conn;
>+     responses[0].text = strdup(conn->passwd);
>+     responses[0].length = curlx_uztoui(strlen(conn->passwd));
>+   }
>+   (void)prompts;
>+-  (void)abstract;
>+ } /* kbd_callback */
>+ 
>+ static CURLcode sftp_libssh2_error_to_CURLE(unsigned long err)
>
>Property changes on: ftp/curl/files/patch-lib_vssh_libssh2.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 254667: 223719 | 223875