Attachment 231197 Details for Bug 261358 – Patch for the FreeBSD ports tree to fix SIGSEGV

[patch] Patch for the FreeBSD ports tree to fix SIGSEGV

pure-ftpd_10501.diff (text/plain), 1.81 KB, created by Artyom Davidov on 2022-01-20 23:49:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Artyom Davidov

Created: 2022-01-20 23:49:52 UTC

Size: 1.81 KB

patch

obsolete

>diff -ruN pure-ftpd.orig/Makefile pure-ftpd/Makefile
>--- pure-ftpd.orig/Makefile	2022-01-21 02:03:05.712873000 +0300
>+++ pure-ftpd/Makefile	2022-01-21 02:35:54.932835000 +0300
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	pure-ftpd
> PORTVERSION=	1.0.50
>+PORTREVISION=	1
> CATEGORIES=	ftp
> MASTER_SITES=	https://github.com/jedisct1/pure-ftpd/releases/download/${PORTVERSION}/ \
> 		https://download.pureftpd.org/pub/pure-ftpd/releases/
>diff -ruN pure-ftpd.orig/files/patch-src_log__pgsql.c pure-ftpd/files/patch-src_log__pgsql.c
>--- pure-ftpd.orig/files/patch-src_log__pgsql.c	1970-01-01 03:00:00.000000000 +0300
>+++ pure-ftpd/files/patch-src_log__pgsql.c	2022-01-21 01:55:10.501231000 +0300
>@@ -0,0 +1,27 @@
>+--- src/log_pgsql.c.orig
>++++ src/log_pgsql.c
>+@@ -278,7 +278,6 @@ static int pw_pgsql_connect(PGconn ** const id_sql_server)
>+     *id_sql_server = NULL;
>+ 
>+     if ((escaped_server = pw_pgsql_escape_conninfo(server)) == NULL ||
>+-        (escaped_port = pw_pgsql_escape_conninfo(port)) == NULL ||
>+         (escaped_db = pw_pgsql_escape_conninfo(db)) == NULL ||
>+         (escaped_user = pw_pgsql_escape_conninfo(user)) == NULL ||
>+         (escaped_pw = pw_pgsql_escape_conninfo(pw)) == NULL) {
>+@@ -296,7 +295,7 @@ static int pw_pgsql_connect(PGconn ** const id_sql_server)
>+     }
>+     if (SNCHECK(snprintf(conninfo, sizeof_conninfo,
>+                          PGSQL_CONNECT_FMTSTRING,
>+-                         escaped_server, escaped_port, escaped_db,
>++                         escaped_server, port, escaped_db,
>+                          escaped_user, escaped_pw), sizeof_conninfo)) {
>+         goto bye;
>+     }
>+@@ -314,7 +313,6 @@ static int pw_pgsql_connect(PGconn ** const id_sql_server)
>+     bye:
>+     free(conninfo);
>+     free(escaped_server);
>+-    free(escaped_port);
>+     free(escaped_db);
>+     free(escaped_user);
>+     free(escaped_pw);

Flags:

ard_1: maintainer-approval? (sunpoet)

Actions: View | Diff

Attachments on bug 261358: 231180 | 231197 | 231199