From a64e7039fbaecb25236b752f339ab4ab03be41cb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 26 Jan 2000 01:37:51 +0000 Subject: [PATCH] Handle case of missing \0 at the end of the given argz. --- string/argz-stringify.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/string/argz-stringify.c b/string/argz-stringify.c index cd57b98d42a..0bbc807953a 100644 --- a/string/argz-stringify.c +++ b/string/argz-stringify.c @@ -1,5 +1,5 @@ /* Routines for dealing with '\0' separated arg vectors. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader @@ -26,13 +26,16 @@ void __argz_stringify (char *argz, size_t len, int sep) { - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len; - len -= part_len + 1; - if (len > 0) + if (len > 0) + do + { + size_t part_len = strnlen (argz, len); + argz += part_len; + len -= part_len; + if (len == 0) + break; *argz++ = sep; - } + } + while (--len > 0); } weak_alias (__argz_stringify, argz_stringify) -- 2.47.2