Commit Diff

Commit:
d4261a58adb6613564784042c8785a3b8567d0f9
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix read error handling in gotweb_render_patch() and check error before writing
Actions:
Patch | Tree
commit - 96aa828c567a295a72eb8a078abf6a4caf4604dd
commit + d4261a58adb6613564784042c8785a3b8567d0f9
blob - cd49228ec99471205e216489a687095f309e2ee8
blob + d5af2ffcb28eb41174cdfe8a016103fbb42d50da
--- gotwebd/pages.tmpl
+++ gotwebd/pages.tmpl
@@ -1238,6 +1238,7 @@ nextsep(char *s, char **t)
 	struct tm		 tm;
 	char			 buf[BUFSIZ], datebuf[64];
 	size_t			 r;
+	int			 w;
 
 	if (gmtime_r(&rc->committer_time, &tm) == NULL ||
 	    asctime_r(&tm, datebuf) == NULL)
@@ -1258,9 +1259,11 @@ date: {{ datebuf }} {{ " UTC" }} {{ "\n" }}
 		return (-1);
 	for (;;) {
 		r = fread(buf, 1, sizeof(buf), t->fp);
-		if (fcgi_write(c, buf, r) == -1 ||
-		    r != sizeof(buf))
+		if (r == 0)
 			break;
+		w = fcgi_write(c, buf, r);
+		if (w == -1)
+			break;
 	}
 !}
 {{ end }}