Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/pkg_install/dist/lib var_get_memory():



details:   https://anonhg.NetBSD.org/src/rev/142e40946d1f
branches:  trunk
changeset: 786870:142e40946d1f
user:      martin <martin%NetBSD.org@localhost>
date:      Thu May 16 19:19:44 2013 +0000

description:
var_get_memory():
if no eol is found in the string we set "next" to NULL, assign it
to "buf" and then check the loop condition by dereferencing it - which
does not work well.
Change the loop condition to first check for buf == NULL.

diffstat:

 external/bsd/pkg_install/dist/lib/var.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 13f74e4da711 -r 142e40946d1f external/bsd/pkg_install/dist/lib/var.c
--- a/external/bsd/pkg_install/dist/lib/var.c   Thu May 16 19:06:45 2013 +0000
+++ b/external/bsd/pkg_install/dist/lib/var.c   Thu May 16 19:19:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.1.1.3 2009/08/06 16:55:29 joerg Exp $        */
+/*     $NetBSD: var.c,v 1.2 2013/05/16 19:19:44 martin Exp $   */
 
 /*-
  * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: var.c,v 1.1.1.3 2009/08/06 16:55:29 joerg Exp $");
+__RCSID("$NetBSD: var.c,v 1.2 2013/05/16 19:19:44 martin Exp $");
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -156,7 +156,7 @@
        value = NULL;
        valuelen = 0;
 
-       for (; *buf; buf = next) {
+       for (; buf && *buf; buf = next) {
                if ((eol = strchr(buf, '\n')) != NULL) {
                        next = eol + 1;
                        len = eol - buf;



Home | Main Index | Thread Index | Old Index