Fix issues in nickm's review of log_from_pipe for bug #1903

- Replace sscanf with tor_sscanf
- Replace use of strstr with equivalent call to strcmpstart
This commit is contained in:
Steven Murdoch 2010-10-07 22:30:40 +01:00
parent 4d694c7890
commit 23e9f362a2

View File

@ -3177,10 +3177,10 @@ log_from_pipe(FILE *stream, int severity, const char *executable,
} }
/* Check if buf starts with SPAWN_ERROR_MESSAGE */ /* Check if buf starts with SPAWN_ERROR_MESSAGE */
if (strstr(buf, SPAWN_ERROR_MESSAGE) == buf) { if (strcmpstart(buf, SPAWN_ERROR_MESSAGE) == 0) {
/* Parse error message */ /* Parse error message */
int retval, child_state, saved_errno; int retval, child_state, saved_errno;
retval = sscanf(buf, SPAWN_ERROR_MESSAGE "%d/%d", retval = tor_sscanf(buf, SPAWN_ERROR_MESSAGE "%x/%x",
&child_state, &saved_errno); &child_state, &saved_errno);
if (retval == 2) { if (retval == 2) {
log_warn(LD_GENERAL, log_warn(LD_GENERAL,