CVS commit: src/usr.bin/infocmp

[Roy Marples]

Module Name:    src
Committed By:   roy
Date:           Tue Mar 31 12:44:15 UTC 2020

Modified Files:
        src/usr.bin/infocmp: infocmp.c

Log Message:
infocmp: don't crash when a terminfo description does not have an alias


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/infocmp/infocmp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/infocmp/infocmp.c
diff -u src/usr.bin/infocmp/infocmp.c:1.16 src/usr.bin/infocmp/infocmp.c:1.17
--- src/usr.bin/infocmp/infocmp.c:1.16	Mon Mar 30 00:22:18 2020
+++ src/usr.bin/infocmp/infocmp.c	Tue Mar 31 12:44:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: infocmp.c,v 1.16 2020/03/30 00:22:18 roy Exp $ */
+/* $NetBSD: infocmp.c,v 1.17 2020/03/31 12:44:15 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: infocmp.c,v 1.16 2020/03/30 00:22:18 roy Exp $");
+__RCSID("$NetBSD: infocmp.c,v 1.17 2020/03/31 12:44:15 roy Exp $");
 
 #include <sys/ioctl.h>
 
@@ -715,8 +715,6 @@ main(int argc, char **argv)
 		use_terms(t, argc - optind, argv + optind);
 
 	if ((optind + 1 != argc && nflag == 0) || uflag != 0) {
-		char *alias, *aliascpy, *delim;
-
 		if (uflag == 0)
 			printf("# Reconstructed from %s\n",
 			     _ti_database == NULL ?
@@ -726,24 +724,28 @@ main(int argc, char **argv)
 		if (term != NULL)
 			*term = '\0';
 		printf("%s", t->name);
-		alias = aliascpy = estrdup(t->_alias);
-		while (alias != NULL && *alias != '\0') {
-			putchar('|');
-			delim = strchr(alias, TERMINFO_VDELIM);
-			if (delim != NULL)
-				*delim++ = '\0';
-			printf("%s", alias);
-			if (delim != NULL) {
-				while (*delim != '\0' && *delim != '|')
-					delim++;
-				if (*delim == '\0')
+		if (t->_alias != NULL) {
+			char *alias, *aliascpy, *delim;
+
+			alias = aliascpy = estrdup(t->_alias);
+			while (alias != NULL && *alias != '\0') {
+				putchar('|');
+				delim = strchr(alias, TERMINFO_VDELIM);
+				if (delim != NULL)
+					*delim++ = '\0';
+				printf("%s", alias);
+				if (delim != NULL) {
+					while (*delim != '\0' && *delim != '|')
+						delim++;
+					if (*delim == '\0')
+						alias = NULL;
+					else
+						alias = delim + 1;
+				} else
 					alias = NULL;
-				else
-					alias = delim + 1;
-			} else
-				alias = NULL;
+			}
+			free(aliascpy);
 		}
-		free(aliascpy);
 		if (t->desc != NULL && *t->desc != '\0')
 			printf("|%s", t->desc);
 		printf(",\n");