Commit 86828e20 authored by Sebastian Hahn's avatar Sebastian Hahn
Browse files

Proper NULL checking in circuit_list_path_impl() 

Another dereference-then-NULL-check sequence. No reports of this bug
triggered in the wild. Fixes bugreport 1256.

Thanks to ekir for discovering and reporting this bug.
parent f36c36f4

ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Changes in version 0.2.1.25 - 2010-??-?? 
    - Fix a dereference-then-NULL-check sequence when publishing

      descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,

      fixes bug 1255.

    - Fix another dereference-then-NULL-check sequence. Bugfix on

      0.2.1.14-rc. Discovered by ekir, fixes bug 1256.



Changes in version 0.2.1.24 - 2010-02-21

  Tor 0.2.1.24 makes Tor work again on the latest OS X -- this time

src/or/circuitbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -137,11 +137,11 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) 
    const char *id;

    if (!hop)

      break;

    id = hop->extend_info->identity_digest;

    if (!verbose && hop->state != CPATH_STATE_OPEN)

      break;

    if (!hop->extend_info)

      break;

    id = hop->extend_info->identity_digest;

    if (verbose_names) {

      elt = tor_malloc(MAX_VERBOSE_NICKNAME_LEN+1);

      if ((ri = router_get_by_digest(id))) {