libnih

Merge lp://staging/~jamesodhunt/libnih/strchr-fixes into lp://staging/libnih

  1. strchr-fixes
  2. Merge into trunk
Proposed by James Hunt
Status: Merged
Merged at revision: 1054
Proposed branch: lp://staging/~jamesodhunt/libnih/strchr-fixes
Merge into: lp://staging/libnih
Diff against target: 66 lines (+18/-1)
4 files modified
ChangeLog (+14/-0)
nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c (+1/-0)
nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c (+2/-0)
nih/config.c (+1/-1)
To merge this branch: bzr merge lp://staging/~jamesodhunt/libnih/strchr-fixes
Reviewer Review Type Date Requested Status
Scott James Remnant Pending
Review via email: mp+73431@code.staging.launchpad.net

Description of the change

      * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c
        (test_unix_fd_to_str): Sanity check value before invoking strchr in
        case it returns address of null (which would give a misleading test
        pass).
      * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c
        (test_unix_fd_to_str, test_unix_fd_to_str_sync): Sanity check value
        before invoking strchr in case it returns address of null (which would
        give a misleading test pass).
      * nih/config.c (): nih_config_block_end: Add check to ensure strchr()
        doesn't return address of null since this would result in a misleading
        return value of TRUE.

To post a comment you must log in.
Revision history for this message
James Hunt (jamesodhunt) wrote :

Hi Scott,

Regarding the comments on: https://code.launchpad.net/~jamesodhunt/libnih/fix-for-bug-834813/+merge/73383 wrt existing strchr usage, these were the only instances of strchr() I could find that could return bogus values.

Cheers,

James.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches