From owner-svn-ports-head@FreeBSD.ORG Tue Feb 25 18:39:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B57BB5FE; Tue, 25 Feb 2014 18:39:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 882DD19F1; Tue, 25 Feb 2014 18:39:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PId1YL051822; Tue, 25 Feb 2014 18:39:01 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PId0gx051816; Tue, 25 Feb 2014 18:39:00 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402251839.s1PId0gx051816@svn.freebsd.org> From: Pawel Pekala Date: Tue, 25 Feb 2014 18:39:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346059 - in head/mail/dbmail: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 18:39:01 -0000 Author: pawel Date: Tue Feb 25 18:39:00 2014 New Revision: 346059 URL: http://svnweb.freebsd.org/changeset/ports/346059 QAT: https://qat.redports.org/buildarchive/r346059/ Log: Fix crashes in dbmail-pop3d as per http://www.dbmail.org/mantis/view.php?id=1043 PR: ports/186869 Submitted by: maintainer Added: head/mail/dbmail/files/patch-src_db__dm.c (contents, props changed) head/mail/dbmail/files/patch-src_pop3.c (contents, props changed) Modified: head/mail/dbmail/Makefile Modified: head/mail/dbmail/Makefile ============================================================================== --- head/mail/dbmail/Makefile Tue Feb 25 18:31:15 2014 (r346058) +++ head/mail/dbmail/Makefile Tue Feb 25 18:39:00 2014 (r346059) @@ -3,7 +3,7 @@ PORTNAME= dbmail PORTVERSION= 3.1.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/3.1/ \ http://git.dbmail.eu/paul/dbmail/snapshot/ Added: head/mail/dbmail/files/patch-src_db__dm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dbmail/files/patch-src_db__dm.c Tue Feb 25 18:39:00 2014 (r346059) @@ -0,0 +1,15 @@ +diff --git src/dm_db.c b/src/dm_db.c +index 559d83c..529a48e 100644 +--- src/dm_db.c ++++ src/dm_db.c +@@ -1832,7 +1832,9 @@ char * db_get_message_lines(uint64_t message_idnr, long lines) + return NULL; + + msg = dbmail_message_new(NULL); +- msg = dbmail_message_retrieve(msg, physmessage_id); ++ if (! (msg = dbmail_message_retrieve(msg, physmessage_id))) ++ return NULL; ++ + stream = msg->crlf; + + if (lines >=0) { Added: head/mail/dbmail/files/patch-src_pop3.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dbmail/files/patch-src_pop3.c Tue Feb 25 18:39:00 2014 (r346059) @@ -0,0 +1,20 @@ +diff --git src/pop3.c src/pop3.c +index 2b8792e..a09524e 100644 +--- src/pop3.c ++++ src/pop3.c +@@ -302,7 +302,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...) + + if (session->error_count >= MAX_ERRORS) { + ci_write(ci, "-ERR too many errors\r\n"); +- client_session_bailout(&session); + return -3; + } + va_start(ap, formatstring); +@@ -314,7 +313,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...) + g_free(s); + + if (ci->client_state & CLIENT_ERR) { +- client_session_bailout(&session); + return -3; + } +