Changeset 17716

Timestamp:

10/05/11 15:10:50 (21 months ago)

Author:

BrainSlayer

Message:

fix pointer dereference

Location:

src/router/httpd

Files:

• httpd.h (modified) (1 diff)
• visuals/ejs.c (modified) (3 diffs)

src/router/httpd/httpd.h

@@ -82 +82 @@
 
 typedef struct {
-        char *path;             /* Web page URL path */
+        const char *path;               /* Web page URL path */
         unsigned int size;      /* Size of web page in bytes */
 } websRomPageIndexType;

src/router/httpd/visuals/ejs.c

@@ -46 +46 @@
 int (*wfputs) (char *buf, webs_t fp) = NULL;
 char *(*live_translate) (char *tran) = NULL;
-websRomPageIndexType *websRomPageIndex = NULL;
+websRomPageIndexType *PwebsRomPageIndex = NULL;
 char *(*GOZILA_GET) (webs_t wp, char *name) = NULL;
 void (*validate_cgi) (webs_t fp) = NULL;
@@ -71 +71 @@
         wfputc = env->Pwfputc;
         wfputs = env->Pwfputs;
-        websRomPageIndex = env->PwebsRomPageIndex;
+        PwebsRomPageIndex = env->PwebsRomPageIndex;
         live_translate = env->Plive_translate;
         GOZILA_GET = env->PGOZILA_GET;
@@ -1185 +1185 @@
         int i = 0;
 
-        while (websRomPageIndex[i].path != NULL) {
-                cprintf("checking %s\n", websRomPageIndex[i].path);
+        while (PwebsRomPageIndex[i].path != NULL) {
+                cprintf("checking %s\n", PwebsRomPageIndex[i].path);
                 if (!strncmp
-                    (websRomPageIndex[i].path, "lang_pack/",
+                    (PwebsRomPageIndex[i].path, "lang_pack/",
                      strlen("lang_pack/"))) {
                         cprintf("found language\n");
-                        if (strlen(websRomPageIndex[i].path) < 14)
+                        if (strlen(PwebsRomPageIndex[i].path) < 14)
                                 continue;
-                        strcpy(buf, websRomPageIndex[i].path);
+                        strcpy(buf, PwebsRomPageIndex[i].path);
                         char *mybuf = &buf[strlen("lang_pack/")];