WebSVN – RepoView – Diff – /trunk/CGI/repo.c

-/* $Id: repo.c 11 2024-08-21 04:31:55Z nishi $ */
+/* $Id: repo.c 12 2024-08-21 05:05:19Z nishi $ */
 #include "rv_repo.h"
 #include "../config.h"
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <signal.h>
 char* rv_construct_repouser(const char* reponame, const char* username) {
 	char cbuf[2];
 	cbuf[0] = REPO_USER_DELIM;
 	cbuf[1] = 0;
 				d[i] = 0;
 			} else if(d[i] == '\n' || d[i] == 0) {
 				char oldc = d[i];
 				d[i] = 0;
 				count++;
-				if(count > 1 && strlen(d + incr + 1) > 0 && d[incr] != 0) {
+				if(count > 1 && d[incr] != 0 && strlen(d + incr + 1) > 0) {
 					char* pathname = d + incr + 1;
 					if(phase == 0 && pathname[strlen(pathname) - 1] == '/') {
 						handler(d + incr + 1);
 					} else if(phase == 1 && pathname[strlen(pathname) - 1] != '/') {
 						handler(d + incr + 1);
 				incr = i + 1;
 				if(oldc == 0) break;
+			}
+		}
 		phase++;
+		incr = 0;
+		count = 0;
 		if(phase == 1) goto repeat;
 		free(d);
+	}
 	free(svnpath);
 	return true;
+}
 char* rv_read_file(const char* repouser, char* path) {
+	if(rv_get_filesize(repouser, path) > 1024 * 128) return NULL;
 	char* svnpath = rv_strcat3(SVN_ROOT, "/", repouser);
 	int pipes[2];
 	pipe(pipes);
 	pid_t pid = fork();
 	if(pid == 0) {
 		char* cmd[] = {"svnlook", "cat", svnpath, (char*)path, NULL};
 		execvp("svnlook", cmd);
 		_exit(0);
 	} else {
 		close(pipes[1]);
-		char cbuf[2];
+		char cbuf[1024];
-		cbuf[1] = 0;
-		char* d = malloc(1);
+		char* d = malloc(1024 * 128);
-		d[0] = 0;
+		int incr = 0;
+		bool bin = false;
 		while(1) {
-			int n = read(pipes[0], cbuf, 1);
+			int n = read(pipes[0], cbuf, 1024);
+			if(cbuf[0] == 0) {
+				bin = true;
+				kill(pid, SIGKILL);
+				break;
+			}
 			if(n == 0) break;
-			char* tmp = d;
+			memcpy(d + incr, cbuf, n);
-			d = rv_strcat(tmp, cbuf);
+			d[incr + n] = 0;
-			free(tmp);
+			incr += n;
+		}
 		int status;
 		waitpid(pid, &status, 0);
 		if(WEXITSTATUS(status) != 0) {
 			free(d);
 			free(svnpath);
 			return NULL;
+		}
+		if(bin) {
+			free(d);
+			return NULL;
+		}
 		return d;
+	}
+}

Subversion Repositories RepoView

(root)/trunk/CGI/repo.c – Rev 11 → 12