From nobody Thu Sep 07 20:28:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6V0CKdz4ssnw; Thu, 7 Sep 2023 20:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6T5T9Hz4ZnM; Thu, 7 Sep 2023 20:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GG7UngI+PRdM0W8ghPrYLeCg7hT670StDOYO4PUFnWY=; b=RCLCqqdyN6vvkTWq37PEctkdpZHlWH4M8KEx3VaTYllF+feJayKOiQji1XHZ+r73rr6cse Yt0t06AmNB7GiIpmzQcXDmwqhEnkUEB4wpkUZzKREploDRAnwknkKa7f5eqRCUOPgLaHcp HeKFD+2WLui7boXSthrAa/qD8yOd8eJbfERRBIYSX9Ao/iMJh3kKIt9hbiu/xbpVi+wUsI uIrhNUSiyyWSlzTjUJ65AE7NgqT28MpvrpptLhgEPxlK62m4kcIaZKmZgtjN7/h2JeRrWU qvp0qQD7jN5el4GdbyfNSgd1SSbrVMjbQP0me0vCS42NG4p/SPMtRhGG7Ozrkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118529; a=rsa-sha256; cv=none; b=qnRxiFFouMA9UEgvN9ValdsKZp67PcxiSmQ7l7hDBvFef3OCJFJkla5ML1xfyOh7mdr4qn Dh7dZXz8c5Clqpz179zfVWs7r/ANZRYPZuoyJmBI21Ttc/wrWw6erxpXStBYdA5CO9xPjA QtknY63HpsIQJaUqKb/XZX4RrtdOyJzdELejg/YzUYb42raNJpbTLoP56nfiAwv2cGuCFv Styj63kp3DkJRbG3oS5aOK9FpkG3MDm21V9DCKDRkdbIG1MMwbmwQPE9Ni7z+EBz3gMC24 bVCL097ngNRvQl5nP+45hHMCiYfKKkiGJYd6K1HihzeDgDpmWfqgLp2mUUeabg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GG7UngI+PRdM0W8ghPrYLeCg7hT670StDOYO4PUFnWY=; b=mpdECsFTMjUny1YiAETiyv2y9cBINDVUFKbTWATO/wkOh2Wmjh4JZJgRquwM2L4lkHvVJj LPccWehD7YLrxlZYeAA9iZNWrOy7IrB47qS0rDVcQNBNnT8NRpOXwuU0aJahYhi7CbWoa9 GvokZUItLqYrmozRNlTNUWzxxtuxeEZPGTu7AKDWs5lHkwfmuX2x7pAhPoWJdfS6tHg1Rv 4LmTuDQ+/NyAV8lpZWGmcvgrgtjOtis4V0nNgwQQFHj4pML60TvDldkZedMbppSGHoPNa1 Eb8WV0JXf5Vod+97m8h963u70lxR7XKThQChs5JRo49qvjo9NENeN7OyMHlmxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RhW6T48Qsz1CN3; Thu, 7 Sep 2023 20:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSnIl064734; Thu, 7 Sep 2023 20:28:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSn5Z064731; Thu, 7 Sep 2023 20:28:49 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:49 GMT Message-Id: <202309072028.387KSn5Z064731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b27e66f26643 - stable/14 - libipf: fix parser error message. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b27e66f2664359de22ff752faf7a81b6530fd009 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b27e66f2664359de22ff752faf7a81b6530fd009 commit b27e66f2664359de22ff752faf7a81b6530fd009 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-31 20:15:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 libipf: fix parser error message. MFC after: 1 week Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41652 (cherry picked from commit 4cd9d804ae8b955d47dfa0bba06e7c254d760cb1) Approved by: re (gjb) --- sbin/ipf/libipf/parseipfexpr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbin/ipf/libipf/parseipfexpr.c b/sbin/ipf/libipf/parseipfexpr.c index 215e43b2978d..880258e5dd66 100644 --- a/sbin/ipf/libipf/parseipfexpr.c +++ b/sbin/ipf/libipf/parseipfexpr.c @@ -93,11 +93,7 @@ parseipfexpr(char *line, char **errorptr) break; } if (e->ipoe_word == NULL) { - error = malloc(32); - if (error != NULL) { - snprintf(error, sizeof(error), "keyword (%.10s) not found", - ops); - } + asprintf(&error, "keyword (%.10s) not found", ops); goto parseerror; }