diff options
| author | rillig <rillig@pkgsrc.org> | 2020-03-14 09:18:49 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-03-14 09:18:49 +0000 |
| commit | 0619fbc1a06ab0750ecc7a731964b74fc9296199 (patch) | |
| tree | 77c27f3634d6ffb600c448ce70dba5d8e58dfb51 /pkgtools/check-portability | |
| parent | 696b54f206cd99ddb9926aee66a863dadf61dc82 (diff) | |
| download | pkgsrc-0619fbc1a06ab0750ecc7a731964b74fc9296199.tar.gz | |
pkgtools/check-portability: update to 19.4.3
Changes since 19.4.2:
Fixed a crash when a file started with an empty line.
Diffstat (limited to 'pkgtools/check-portability')
| -rw-r--r-- | pkgtools/check-portability/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/check-portability/files/check-portability.c | 5 | ||||
| -rw-r--r-- | pkgtools/check-portability/files/testdata/empty-line | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgtools/check-portability/Makefile b/pkgtools/check-portability/Makefile index 9b28c6652fa..ac84267c1ba 100644 --- a/pkgtools/check-portability/Makefile +++ b/pkgtools/check-portability/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2020/03/13 16:20:34 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2020/03/14 09:18:49 rillig Exp $ -PKGNAME= check-portability-19.4.2 +PKGNAME= check-portability-19.4.3 CATEGORIES= pkgtools DISTFILES= # none diff --git a/pkgtools/check-portability/files/check-portability.c b/pkgtools/check-portability/files/check-portability.c index a6c88f6c8a3..e6631fa97fb 100644 --- a/pkgtools/check-portability/files/check-portability.c +++ b/pkgtools/check-portability/files/check-portability.c @@ -1,4 +1,4 @@ -/* $NetBSD: check-portability.c,v 1.9 2020/03/13 16:43:05 rillig Exp $ */ +/* $NetBSD: check-portability.c,v 1.10 2020/03/14 09:18:49 rillig Exp $ */ /* Copyright (c) 2020 Roland Illig @@ -171,8 +171,7 @@ typedef struct { static cstr str_c(str *s) { - assert(s->data != nullptr); - return (cstr) { s->data, s->len }; + return (cstr) { s->data == nullptr ? "" : s->data, s->len }; } static void diff --git a/pkgtools/check-portability/files/testdata/empty-line b/pkgtools/check-portability/files/testdata/empty-line new file mode 100644 index 00000000000..e7ba1acc1eb --- /dev/null +++ b/pkgtools/check-portability/files/testdata/empty-line @@ -0,0 +1,3 @@ + +On 2020-03-14, check-portability crashed on files that started with an +empty line. This file ensures that this doesn't happen again. |