igphtext() and gphlink(): fix NUL byte check - stagit-gemini - Stagit for gemini protocol Openbsd Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/stagit-gemini.git URL:git://thinkerwim.org/stagit-gemini.git thinkerwim.org 70 1Log /git/stagit-gemini/log.gph thinkerwim.org 70 1Files /git/stagit-gemini/files.gph thinkerwim.org 70 1Refs /git/stagit-gemini/refs.gph thinkerwim.org 70 1README /git/stagit-gemini/file/README.gph thinkerwim.org 70 1LICENSE /git/stagit-gemini/file/LICENSE.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 45274ebb4ba07c9771c279aae51259040d94d0ab /git/stagit-gemini/commit/45274ebb4ba07c9771c279aae51259040d94d0ab.gph thinkerwim.org 70 1parent bbd27612e48b51f37e4e70566ded2007fe48724f /git/stagit-gemini/commit/bbd27612e48b51f37e4e70566ded2007fe48724f.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Sat, 25 Nov 2017 15:12:36 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 igphtext() and gphlink(): fix NUL byte check Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 ithese functions iterate until the length or when there is a NUL byte. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher-index.c | 12 ++++++------ Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.c | 14 +++++++------- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i2 files changed, 13 insertions(+), 13 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher-index.c b/stagit-gopher-index.c /git/stagit-gemini/file/stagit-gopher-index.c.gph thinkerwim.org 70 i@@ -75,8 +75,8 @@ gphtext(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i size_t i; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; *s && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i- switch (s[i]) { Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; *s && i < len; s++, i++) { Err thinkerwim.openbsd.amsterdam 70 i+ switch (*s) { Err thinkerwim.openbsd.amsterdam 70 i case '\r': /* ignore CR */ Err thinkerwim.openbsd.amsterdam 70 i case '\n': /* ignore LF */ Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i@@ -84,7 +84,7 @@ gphtext(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i default: Err thinkerwim.openbsd.amsterdam 70 i- fputc(s[i], fp); Err thinkerwim.openbsd.amsterdam 70 i+ fputc(*s, fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -96,8 +96,8 @@ gphlink(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i size_t i; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; *s && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i- switch (s[i]) { Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; *s && i < len; s++, i++) { Err thinkerwim.openbsd.amsterdam 70 i+ switch (*s) { Err thinkerwim.openbsd.amsterdam 70 i case '\r': /* ignore CR */ Err thinkerwim.openbsd.amsterdam 70 i case '\n': /* ignore LF */ Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i@@ -108,7 +108,7 @@ gphlink(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i fputs("\\|", fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i default: Err thinkerwim.openbsd.amsterdam 70 i- fputc(s[i], fp); Err thinkerwim.openbsd.amsterdam 70 i+ fputc(*s, fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher.c b/stagit-gopher.c /git/stagit-gemini/file/stagit-gopher.c.gph thinkerwim.org 70 i@@ -297,7 +297,7 @@ gphtextnl(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i size_t i, n = 0; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; *s && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; s[i] && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i if (s[i] == '\n') Err thinkerwim.openbsd.amsterdam 70 i n = 0; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -323,8 +323,8 @@ gphtext(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i size_t i; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; *s && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i- switch (s[i]) { Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; *s && i < len; s++, i++) { Err thinkerwim.openbsd.amsterdam 70 i+ switch (*s) { Err thinkerwim.openbsd.amsterdam 70 i case '\r': /* ignore CR */ Err thinkerwim.openbsd.amsterdam 70 i case '\n': /* ignore LF */ Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i@@ -332,7 +332,7 @@ gphtext(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i default: Err thinkerwim.openbsd.amsterdam 70 i- fputc(s[i], fp); Err thinkerwim.openbsd.amsterdam 70 i+ fputc(*s, fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -344,8 +344,8 @@ gphlink(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i size_t i; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; *s && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i- switch (s[i]) { Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; *s && i < len; s++, i++) { Err thinkerwim.openbsd.amsterdam 70 i+ switch (*s) { Err thinkerwim.openbsd.amsterdam 70 i case '\r': /* ignore CR */ Err thinkerwim.openbsd.amsterdam 70 i case '\n': /* ignore LF */ Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i@@ -356,7 +356,7 @@ gphlink(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i fputs("\\|", fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i default: Err thinkerwim.openbsd.amsterdam 70 i- fputc(s[i], fp); Err thinkerwim.openbsd.amsterdam 70 i+ fputc(*s, fp); Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 .