Page MenuHomeFreeBSD
Differential D7644

bspatch: clean up output file in the case of error
ClosedPublic
Actions

Authored by emaste on Aug 25 2016, 6:47 PM.
Tags
None
Referenced Files
F115224895: D7644.id19690.diff
Mon, Apr 21, 2:40 PM
F115215929: D7644.id19690.diff
Mon, Apr 21, 12:38 PM
Unknown Object (File)
Sun, Apr 20, 8:17 AM
Unknown Object (File)
Sat, Apr 19, 5:57 AM
Unknown Object (File)
Sun, Apr 13, 6:33 AM
Unknown Object (File)
Fri, Apr 11, 11:10 AM
Unknown Object (File)
Tue, Apr 8, 1:57 AM
Unknown Object (File)
Mar 19 2025, 2:23 AM
View All Files
Subscribers
None

Details

Reviewers
allanjude
delphij
cperciva
oshogbo
Commits
rS304821: bspatch: remove output file in the case of error

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste updated this revision to Diff 19683.Aug 25 2016, 6:47 PM
emaste retitled this revision from to bspatch: clean up output file in the case of error.
emaste updated this object.
emaste edited the test plan for this revision. (Show Details)
emaste added reviewers: allanjude, oshogbo, cperciva, delphij.
emaste updated this revision to Diff 19686.Aug 25 2016, 7:14 PM

unlinkat is POSIX so no need to use it only in the #ifdef CAPSICUM case

usr.bin/bsdiff/bspatch/bspatch.c
156

bonus whitespace fix

oshogbo edited edge metadata.Aug 25 2016, 7:59 PM

Some comments.

usr.bin/bsdiff/bspatch/bspatch.c
58

Blank space needed.

133

This can fail right?

134

dirname, can return NULL.

137

This can fail.

emaste updated this revision to Diff 19690.Aug 25 2016, 8:35 PM
emaste edited edge metadata.

fixups from @oshogbo

oshogbo added inline comments.Aug 25 2016, 8:41 PM
usr.bin/bsdiff/bspatch/bspatch.c
136

namebuf can be NULL. Should we print argv[2]?

emaste updated this revision to Diff 19691.Aug 25 2016, 8:44 PM

add strdup failure check

emaste updated this revision to Diff 19692.Aug 25 2016, 8:47 PM

one more fix from @oshogbo

oshogbo added inline comments.Aug 25 2016, 8:47 PM
usr.bin/bsdiff/bspatch/bspatch.c
136

Sorry for being PITA but namebuf still can be NULL, in this err msg.

oshogbo accepted this revision.Aug 25 2016, 8:48 PM
oshogbo edited edge metadata.

Thank you for doing this.

This revision is now accepted and ready to land.Aug 25 2016, 8:48 PM
Closed by commit rS304821: bspatch: remove output file in the case of error (authored by emaste). · Explain WhyAug 25 2016, 9:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
usr.bin/
bsdiff/
bspatch/
33 lines

Diff 19691

View Options

usr.bin/bsdiff/bspatch/bspatch.c

# Created by: Dan Langille <dvl@FreeBSD.org> # Created by: Dan Langille <dvl@FreeBSD.org>
# $FreeBSD$ # $FreeBSD$
PORTNAME= crits PORTNAME= crits
PORTVERSION= 3.1.0 PORTVERSION= 3.1.0
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= security CATEGORIES= security
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dvl@FreeBSD.org MAINTAINER= dvl@FreeBSD.org
COMMENT= Collaborative Research Into Threats COMMENT= Collaborative Research Into Threats
LICENSE= MIT LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
Show All 25 LinesRUN_DEPENDS+= 7z:${PORTSDIR}/archivers/p7zip \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \ ${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
mongodb>2.6.4:${PORTSDIR}/databases/mongodb \ mongodb>2.6.4:${PORTSDIR}/databases/mongodb \
${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:${PORTSDIR}/databases/pymongo \ ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:${PORTSDIR}/databases/pymongo \
${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:${PORTSDIR}/devel/py-defusedxml \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:${PORTSDIR}/devel/py-defusedxml \
${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:${PORTSDIR}/www/py-django16 \ ${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:${PORTSDIR}/www/py-django16 \
${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.11.0:${PORTSDIR}/www/py-django-tastypie \ ${PYTHON_PKGNAMEPREFIX}django-tastypie16>0:${PORTSDIR}/www/py-django16-tastypie \
${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine>=0.4.5:${PORTSDIR}/devel/py-django-tastypie-mongoengine \ ${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine16>=0.4.5:${PORTSDIR}/devel/py-django16-tastypie-mongoengine \
dvlAuthorUnsubmitted
Not Done
Inline Actions

Fixed the package name...

dvl: Fixed the package name...
${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:${PORTSDIR}/security/py-pydeep \ ${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:${PORTSDIR}/security/py-pydeep \
${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:${PORTSDIR}/devel/py-pefile \ ${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:${PORTSDIR}/devel/py-pefile \
${PYTHON_PKGNAMEPREFIX}yara>=2.1.0:${PORTSDIR}/security/py-yara \ ${PYTHON_PKGNAMEPREFIX}yara>=2.1.0:${PORTSDIR}/security/py-yara \
${PYTHON_PKGNAMEPREFIX}pynids>=0.6.1:${PORTSDIR}/net/pynids \ ${PYTHON_PKGNAMEPREFIX}pynids>=0.6.1:${PORTSDIR}/net/pynids \
${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson \ ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson \
${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp \ ${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp \
${PYTHON_PKGNAMEPREFIX}billiard>=2.7.3.19:${PORTSDIR}/devel/py-billiard \ ${PYTHON_PKGNAMEPREFIX}billiard>=2.7.3.19:${PORTSDIR}/devel/py-billiard \
Show All 19 Lines