Merged revisions 309858 via svnmerge from
authorJonathan Rose <jrose@digium.com>
Mon, 7 Mar 2011 22:16:33 +0000 (22:16 +0000)
committerJonathan Rose <jrose@digium.com>
Mon, 7 Mar 2011 22:16:33 +0000 (22:16 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r309858 | jrose | 2011-03-07 16:07:25 -0600 (Mon, 07 Mar 2011) | 22 lines

  Merged revisions 309857 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r309857 | jrose | 2011-03-07 16:04:44 -0600 (Mon, 07 Mar 2011) | 15 lines

    Merged revisions 309856 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r309856 | jrose | 2011-03-07 16:02:12 -0600 (Mon, 07 Mar 2011) | 8 lines

      Bug fix for MixMonitor involving filenames with '.' not in the extension

      Closes issue #18391)
      Reported by: pabelanger
      Patches:
            bugfix.patch uploaded by jrose (license 1225)
      Tested by: jrose
    ........
  ................
................

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

apps/app_mixmonitor.c

index 6345489..910e72c 100644 (file)
@@ -280,6 +280,7 @@ static void *mixmonitor_thread(void *obj)
        struct ast_filestream **fs = NULL;
        unsigned int oflags;
        char *ext;
+       char *last_slash;
        int errflag = 0;
        struct ast_format format_slin;
 
@@ -313,7 +314,8 @@ static void *mixmonitor_thread(void *obj)
                                oflags = O_CREAT | O_WRONLY;
                                oflags |= ast_test_flag(mixmonitor, MUXFLAG_APPEND) ? O_APPEND : O_TRUNC;
 
-                               if ((ext = strrchr(mixmonitor->filename, '.')))
+                               last_slash = strrchr(mixmonitor->filename, '/');
+                               if ((ext = strrchr(mixmonitor->filename, '.')) && (ext > last_slash))
                                        *(ext++) = '\0';
                                else
                                        ext = "raw";