From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 22 Jul 2007 04:21:57 +0000 (+0200)
Subject: Bugfixes in the old-style hublist decoder.
X-Git-Tag: 1.0~92
X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=ef4a9a10ada5066d412537305c290211a321d3db

Bugfixes in the old-style hublist decoder.
---

diff --git a/clients/gtk2/hublist-old.c b/clients/gtk2/hublist-old.c
index 83da7fc..ddc00cb 100644
--- a/clients/gtk2/hublist-old.c
+++ b/clients/gtk2/hublist-old.c
@@ -45,10 +45,10 @@ int pubhuboldhandler(int op, char *buf, size_t len)
 	break;
     case PHO_DATA:
 	p = buf;
-	while((p = memchr(p, '\n', len)) != NULL)
+	while((p = memchr((p2 = p), '\n', len - (p - buf))) != NULL)
 	{
 	    *(p++) = 0;
-	    for(i = 0, p2 = buf; i < 4; i++) {
+	    for(i = 0; i < 4; i++) {
 		fields[i] = p2;
 		if((p2 = strchr(p2, '|')) == NULL)
 		    break;
@@ -73,7 +73,7 @@ int pubhuboldhandler(int op, char *buf, size_t len)
 		    free(fields[i]);
 	    }
 	}
-	return(p - buf);
+	return(p2 - buf);
 	break;
     case PHO_EOF:
 	cols[0] = 3; names[0] = _("# users");