Module Name: src
Committed By: christos
Date: Wed May 5 14:49:59 UTC 2021
Modified Files:
src/lib/libedit: filecomplete.c
Log Message:
PR/56147: Miroslav Lichvar: Avoid memory leak if strdup fails.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/lib/libedit/filecomplete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.67 src/lib/libedit/filecomplete.c:1.68
--- src/lib/libedit/filecomplete.c:1.67 Sun Mar 28 09:39:39 2021
+++ src/lib/libedit/filecomplete.c Wed May 5 10:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.67 2021/03/28 13:39:39 christos Exp $ */
+/* $NetBSD: filecomplete.c,v 1.68 2021/05/05 14:49:59 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.67 2021/03/28 13:39:39 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.68 2021/05/05 14:49:59 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -727,7 +727,7 @@ fn_complete2(EditLine *el,
else
completion = strdup(matches[0]);
if (completion == NULL)
- goto out;
+ goto out2;
/*
* Replace the completed string with the common part of
@@ -810,6 +810,7 @@ fn_complete2(EditLine *el,
}
/* free elements of array and the array itself */
+out2:
for (i = 0; matches[i]; i++)
el_free(matches[i]);
el_free(matches);
