From: Carl Worth <cworth@cworth.org>
Date: Sat, 19 Jun 2010 00:37:02 +0000 (-0700)
Subject: main: Close memory leak of shader string from load_text_file.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a9696e79fb3afc6a4724bd16ee1ccdfebebfd0fd;p=mesa.git

main: Close memory leak of shader string from load_text_file.

Could have just added a call to free() to main, but since we're using
talloc everywhere else, we might as well just use it here too. So pass
a new 'ctx' argument to load_text_file.

This removes a single memory leak from all invocations of the
standalone glsl compiler.
---

diff --git a/main.cpp b/main.cpp
index dcd4b8f6725..dfed4a30e83 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,9 +36,9 @@
 #include "ir_print_visitor.h"
 #include "program.h"
 
-
+/* Returned string will have 'ctx' as its talloc owner. */
 static char *
-load_text_file(const char *file_name, size_t *size)
+load_text_file(void *ctx, const char *file_name, size_t *size)
 {
 	char *text = NULL;
 	struct stat st;
@@ -51,7 +51,7 @@ load_text_file(const char *file_name, size_t *size)
 	}
 
 	if (fstat(fd, & st) == 0) {
-	   text = (char *) malloc(st.st_size + 1);
+	   text = (char *) talloc_size(ctx, st.st_size + 1);
 		if (text != NULL) {
 			do {
 				ssize_t bytes = read(fd, text + total_read,
@@ -229,7 +229,8 @@ main(int argc, char **argv)
       else
 	 usage_fail(argv[0]);
 
-      shader->Source = load_text_file(argv[optind], &shader->SourceLen);
+      shader->Source = load_text_file(whole_program,
+				      argv[optind], &shader->SourceLen);
       if (shader->Source == NULL) {
 	 printf("File \"%s\" does not exist.\n", argv[optind]);
 	 exit(EXIT_FAILURE);