diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-03 02:56:00 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-03 02:56:00 +0000 |
| commit | 9b1381fd2fb7179f731709542507015799f90a51 (patch) | |
| tree | 66b3617e0b6ceed9c3123000104df0d78bf9bf2a /networking | |
| parent | bb3d0fab3b46d64e93687bc30b405d0878eca296 (diff) | |
| download | busybox-w32-9b1381fd2fb7179f731709542507015799f90a51.tar.gz busybox-w32-9b1381fd2fb7179f731709542507015799f90a51.tar.bz2 busybox-w32-9b1381fd2fb7179f731709542507015799f90a51.zip | |
convert calloc to xzalloc
fix sleep-on-die option
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/httpd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index e50955ddc..ff5c14672 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -499,7 +499,7 @@ static void parse_conf(const char *path, int flag) | |||
| 499 | continue; | 499 | continue; |
| 500 | if (*p0 == 'A' || *p0 == 'D') { | 500 | if (*p0 == 'A' || *p0 == 'D') { |
| 501 | /* storing current config IP line */ | 501 | /* storing current config IP line */ |
| 502 | pip = calloc(1, sizeof(Htaccess_IP)); | 502 | pip = xzalloc(sizeof(Htaccess_IP)); |
| 503 | if (pip) { | 503 | if (pip) { |
| 504 | if (scan_ip_mask(c, &(pip->ip), &(pip->mask))) { | 504 | if (scan_ip_mask(c, &(pip->ip), &(pip->mask))) { |
| 505 | /* syntax IP{/mask} error detected, protect all */ | 505 | /* syntax IP{/mask} error detected, protect all */ |
| @@ -570,7 +570,7 @@ static void parse_conf(const char *path, int flag) | |||
| 570 | || ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \ | 570 | || ENABLE_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES \ |
| 571 | || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR | 571 | || ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR |
| 572 | /* storing current config line */ | 572 | /* storing current config line */ |
| 573 | cur = calloc(1, sizeof(Htaccess) + strlen(p0)); | 573 | cur = xzalloc(sizeof(Htaccess) + strlen(p0)); |
| 574 | if (cur) { | 574 | if (cur) { |
| 575 | cf = strcpy(cur->before_colon, p0); | 575 | cf = strcpy(cur->before_colon, p0); |
| 576 | c = strchr(cf, ':'); | 576 | c = strchr(cf, ':'); |