From owner-svn-ports-head@FreeBSD.ORG Wed Sep 24 18:35:28 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC6B87DE; Wed, 24 Sep 2014 18:35:28 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D33C916; Wed, 24 Sep 2014 18:35:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8OIZSde027983; Wed, 24 Sep 2014 18:35:28 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8OIZS1N027981; Wed, 24 Sep 2014 18:35:28 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201409241835.s8OIZS1N027981@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 24 Sep 2014 18:35:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369194 - in head/ports-mgmt/pkg: . 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.18-1 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: Wed, 24 Sep 2014 18:35:28 -0000 Author: bdrewery Date: Wed Sep 24 18:35:27 2014 New Revision: 369194 URL: http://svnweb.freebsd.org/changeset/ports/369194 QAT: https://qat.redports.org/buildarchive/r369194/ Log: - Fix crash when overriding repo configs. PR: 193890 Reported by: Nikolai Lifanov With hat: portmgr Pointyhat to: bdrewery Added: head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c (contents, props changed) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Wed Sep 24 18:12:39 2014 (r369193) +++ head/ports-mgmt/pkg/Makefile Wed Sep 24 18:35:27 2014 (r369194) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.3.8 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Added: head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c Wed Sep 24 18:35:27 2014 (r369194) @@ -0,0 +1,28 @@ +commit 67751707406b7da5ff85978f755d4e68bab3d38d +Author: Bryan Drewery +Date: Wed Sep 24 13:30:29 2014 -0500 + + Fix repo override crashing when URL is not defined. + + Only override URL if one is provided. + + Issue: #1024 + +diff --git libpkg/pkg_config.c libpkg/pkg_config.c +index ec96883..83e2f5d 100644 +--- libpkg/pkg_config.c ++++ libpkg/pkg_config.c +@@ -1065,9 +1065,11 @@ pkg_repo_overwrite(struct pkg_repo *r, const char *name, const char *url, + { + + free(r->name); +- free(r->url); + r->name = strdup(name); +- r->url = strdup(url); ++ if (url != NULL) { ++ free(r->url); ++ r->url = strdup(url); ++ } + r->ops = pkg_repo_find_type(type); + HASH_DEL(repos, r); + HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r);