Merged revisions 305131 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 31 Jan 2011 21:01:28 +0000 (21:01 +0000)
committerJason Parker <jparker@digium.com>
Mon, 31 Jan 2011 21:01:28 +0000 (21:01 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r305131 | qwell | 2011-01-31 15:00:25 -0600 (Mon, 31 Jan 2011) | 16 lines

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

  ................
    r305130 | qwell | 2011-01-31 14:59:37 -0600 (Mon, 31 Jan 2011) | 9 lines

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

    ........
      r305129 | qwell | 2011-01-31 14:56:25 -0600 (Mon, 31 Jan 2011) | 2 lines

      Set file descriptors to -1 on creation, so that we don't see weirdness later.
    ........
  ................
................

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

res/res_musiconhold.c

index bce86a8..f905b8a 100644 (file)
@@ -1277,6 +1277,8 @@ static struct mohclass *_moh_class_malloc(const char *file, int line, const char
 #endif
                )) {
                class->format = AST_FORMAT_SLINEAR;
+               class->srcfd = -1;
+               class->pseudofd = -1;
        }
 
        return class;