Changeset 1251

Timestamp:

01/16/10 14:49:56 (11 years ago)

Author:

Admin

Message:

WebIf: Fix reading large templates from config dir.

File:

• branches/monitor-improvement/oscam-http-helpers.c (modified) (1 diff)

branches/monitor-improvement/oscam-http-helpers.c

@@ -161 +161 @@
             FILE *fp;
             char buffer[1024];
-            int read, allocated = 1025, size = 1;
+            int read, allocated = 1025, size = 0;
             result = (char *) malloc(allocated * sizeof(char));
             if((fp = fopen(path,"r"))!=NULL){
             while((read = fread(&buffer,sizeof(char),1024,fp)) > 0){
-                size += read;
-                if(allocated < size) {
+                if(allocated < size + read + 1) {
                     allocated += size + 1024;
                     result = (char *) realloc(result, allocated * sizeof(char));
                 }
-                memcpy(result, buffer, read);
+                memcpy(result + size, buffer, read);
+                size += read;
             }
-            result[size - 1] = '\0';
+            result[size] = '\0';
             fclose (fp);
             return result;