Commit 23e9f362 authored by Steven Murdoch's avatar Steven Murdoch
Browse files

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
parent 4d694c78

src/common/util.c

+3 −3
Original line number Diff line number Diff line
@@ -3177,10 +3177,10 @@ log_from_pipe(FILE *stream, int severity, const char *executable, 
      }



      /* 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 */

          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);

          if (retval == 2) {

              log_warn(LD_GENERAL,