Fossil SCM
Manually merge the blob leak fixes corrected on the 'cgiSetEnv' branch.
Commit
1829fa8845ae7fe20d4046b5585838dd78e5e928
Parent
c97a085a0e7200b…
1 file changed
+2
+2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1794,10 +1794,11 @@ | ||
| 1794 | 1794 | blob_reset(&value); |
| 1795 | 1795 | continue; |
| 1796 | 1796 | } |
| 1797 | 1797 | if( blob_eq(&key, "errorlog:") && blob_token(&line, &value) ){ |
| 1798 | 1798 | g.zErrlog = mprintf("%s", blob_str(&value)); |
| 1799 | + blob_reset(&value); | |
| 1799 | 1800 | continue; |
| 1800 | 1801 | } |
| 1801 | 1802 | if( blob_eq(&key, "HOME:") && blob_token(&line, &value) ){ |
| 1802 | 1803 | cgi_setenv("HOME", blob_str(&value)); |
| 1803 | 1804 | blob_reset(&value); |
| @@ -1834,10 +1835,11 @@ | ||
| 1834 | 1835 | blob_reset(&value2); |
| 1835 | 1836 | continue; |
| 1836 | 1837 | } |
| 1837 | 1838 | if( blob_eq(&key, "files:") && blob_token(&line, &value) ){ |
| 1838 | 1839 | pFileGlob = glob_create(blob_str(&value)); |
| 1840 | + blob_reset(&value); | |
| 1839 | 1841 | continue; |
| 1840 | 1842 | } |
| 1841 | 1843 | } |
| 1842 | 1844 | blob_reset(&config); |
| 1843 | 1845 | if( g.db==0 && g.zRepositoryName==0 && nRedirect==0 ){ |
| 1844 | 1846 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1794,10 +1794,11 @@ | |
| 1794 | blob_reset(&value); |
| 1795 | continue; |
| 1796 | } |
| 1797 | if( blob_eq(&key, "errorlog:") && blob_token(&line, &value) ){ |
| 1798 | g.zErrlog = mprintf("%s", blob_str(&value)); |
| 1799 | continue; |
| 1800 | } |
| 1801 | if( blob_eq(&key, "HOME:") && blob_token(&line, &value) ){ |
| 1802 | cgi_setenv("HOME", blob_str(&value)); |
| 1803 | blob_reset(&value); |
| @@ -1834,10 +1835,11 @@ | |
| 1834 | blob_reset(&value2); |
| 1835 | continue; |
| 1836 | } |
| 1837 | if( blob_eq(&key, "files:") && blob_token(&line, &value) ){ |
| 1838 | pFileGlob = glob_create(blob_str(&value)); |
| 1839 | continue; |
| 1840 | } |
| 1841 | } |
| 1842 | blob_reset(&config); |
| 1843 | if( g.db==0 && g.zRepositoryName==0 && nRedirect==0 ){ |
| 1844 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1794,10 +1794,11 @@ | |
| 1794 | blob_reset(&value); |
| 1795 | continue; |
| 1796 | } |
| 1797 | if( blob_eq(&key, "errorlog:") && blob_token(&line, &value) ){ |
| 1798 | g.zErrlog = mprintf("%s", blob_str(&value)); |
| 1799 | blob_reset(&value); |
| 1800 | continue; |
| 1801 | } |
| 1802 | if( blob_eq(&key, "HOME:") && blob_token(&line, &value) ){ |
| 1803 | cgi_setenv("HOME", blob_str(&value)); |
| 1804 | blob_reset(&value); |
| @@ -1834,10 +1835,11 @@ | |
| 1835 | blob_reset(&value2); |
| 1836 | continue; |
| 1837 | } |
| 1838 | if( blob_eq(&key, "files:") && blob_token(&line, &value) ){ |
| 1839 | pFileGlob = glob_create(blob_str(&value)); |
| 1840 | blob_reset(&value); |
| 1841 | continue; |
| 1842 | } |
| 1843 | } |
| 1844 | blob_reset(&config); |
| 1845 | if( g.db==0 && g.zRepositoryName==0 && nRedirect==0 ){ |
| 1846 |