(no commit message)

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 4c99cdaa0b670080ac8548e8d95de91b7b74de07..69500029cd20ae104bac6160dc8f1c18cb5dfa3d 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -189,16 +189,23 @@ int i=0;
 
 void addenv(char *var, char *val) {
        char *s=malloc(strlen(var)+1+strlen(val)+1);
 
 void addenv(char *var, char *val) {
        char *s=malloc(strlen(var)+1+strlen(val)+1);

-       if (!s)
+       if (!s) {

                perror("malloc");
                perror("malloc");

-       sprintf(s, "%s=%s", var, val);
-       newenviron[i++]=s;
+               exit(1);
+       }
+       else {
+               sprintf(s, "%s=%s", var, val);
+               newenviron[i++]=s;
+       }

 }
 
 void set_cgilock_fd (int lockfd) {
 }
 
 void set_cgilock_fd (int lockfd) {

-       char *fd_s=malloc(8);
+       char fd_s[12];

        sprintf(fd_s, "%i", lockfd);
        sprintf(fd_s, "%i", lockfd);

-       setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
+       if (setenv("IKIWIKI_CGILOCK_FD", fd_s, 1) != 0) {
+               perror("setenv");
+               exit(1);
+       }

 }
 
 int main (int argc, char **argv) {
 }
 
 int main (int argc, char **argv) {