Merged revisions 263639 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r263639 | mmichelson | 2010-05-17 17:00:28 -0500 (Mon, 17 May 2010) | 10 lines

  Fix logic error when checking for a devstate provider.

  When using strsep, if one of the list of specified separators is not found,
  it is the first parameter to strsep which is now NULL, not the pointer returned
  by strsep.

  This issue isn't especially severe in that the worst it is likely to do is waste
  some cycles when a device with no '/' and no ':' is passed to ast_device_state.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@263640 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/devicestate.c b/main/devicestate.c
index 49e24d8abfcdbc06805f193eba8f28f96709fba1..3fee8fe1ea127910892f863b5aee8a1c46c01ce2 100644 (file)
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -323,8 +323,10 @@ static enum ast_device_state _ast_device_state(const char *device, int check_cac
        buf = ast_strdupa(device);
        tech = strsep(&buf, "/");
        if (!(number = buf)) {
-               if (!(provider = strsep(&tech, ":")))
+               provider = strsep(&tech, ":");
+               if (!tech) {
                        return AST_DEVICE_INVALID;
+               }
                /* We have a provider */
                number = tech;
                tech = NULL;