Fix memory leaks

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 77753a9be006d3add446d1a3bde7c9d9924091fc..0789604434dfc2be603f6d8035cfe78fc2db0ff9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -270,8 +270,8 @@ void util_endianswap(void *m, int s, int l) {
     if(*((char *)&s))
         return;
 
-    for(; w < l; w++) {
-        for(;  i < s << 1; i++) {
+    for(; w < (size_t)l; w++) {
+        for(;  i < (size_t)(s << 1); i++) {
             unsigned char *p = (unsigned char *)m+w*s;
             unsigned char  t = p[i];
             p[i]             = p[s-i-1];
@@ -450,16 +450,9 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
         int c = getc(stream);
 
         if (chr < 2) {
-            char *tmp = (char*)mem_a((*n+=(*n>16)?*n:64));
-            if  (!tmp)
-                return -1;
-
-            memcpy(tmp, *lineptr, pos - *lineptr);
             chr = *n + *lineptr - pos;
-            if (!(*lineptr = tmp)) {
-                mem_d (tmp);
+            if (!(*lineptr = (char*)mem_r(*lineptr,(*n+=(*n>16)?*n:64))))
                 return -1;
-            }
             pos = *n - chr + *lineptr;
         }
 
@@ -521,6 +514,15 @@ FILE *util_fopen(const char *filename, const char *mode)
 #endif
 }
 
+bool util_filexists(const char *file) {
+    FILE *fp = fopen(file, "rb");
+    if  (!fp) return false;
+    
+    /* it exists */
+    fclose(fp);
+    return true;
+}
+
 void _util_vec_grow(void **a, size_t i, size_t s) {
     size_t m = *a ? 2*_vec_beg(*a)+i : i+1;
     void  *p = mem_r((*a ? _vec_raw(*a) : NULL), s * m + sizeof(size_t)*2);