|
Lines 1275-1280
Link Here
|
| 1275 |
} |
1275 |
} |
| 1276 |
else |
1276 |
else |
| 1277 |
m->nospflag = 0; |
1277 |
m->nospflag = 0; |
|
|
1278 |
|
| 1279 |
/* Validate desc */ |
| 1280 |
{ |
| 1281 |
int i, count=0; |
| 1282 |
char c; |
| 1283 |
for(i=0; i< sizeof(m->desc)-1; ++i) { |
| 1284 |
c = *l++; |
| 1285 |
if (c == 0) break; |
| 1286 |
if (c == '%') ++count; |
| 1287 |
if (count >1) { |
| 1288 |
m->desc[i] = 0; |
| 1289 |
ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv, |
| 1290 |
MODNAME ": invalid format at line %d, desc %s", lineno, m->desc); |
| 1291 |
return -1; |
| 1292 |
} |
| 1293 |
m->desc[i] = c; |
| 1294 |
} |
| 1295 |
m->desc[i+1] = 0; |
| 1296 |
} |
| 1297 |
|
| 1278 |
strncpy(m->desc, l, sizeof(m->desc) - 1); |
1298 |
strncpy(m->desc, l, sizeof(m->desc) - 1); |
| 1279 |
m->desc[sizeof(m->desc) - 1] = '\0'; |
1299 |
m->desc[sizeof(m->desc) - 1] = '\0'; |
| 1280 |
|
1300 |
|
|
Lines 2403-2408
Link Here
|
| 2403 |
prevm = m; |
2423 |
prevm = m; |
| 2404 |
} |
2424 |
} |
| 2405 |
#endif |
2425 |
#endif |
|
|
2426 |
return result; |
| 2406 |
} |
2427 |
} |
| 2407 |
} |
2428 |
} |
| 2408 |
return OK; |
2429 |
return OK; |