Bug 6896 - Fix for garbled wav49 format

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

diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 3a1dfdfb349fcecbae84f1bad3afbe8f679984cb..9dbf30b53b901630b360f0ca8ea59bb436dc9994 100644 (file)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -226,7 +226,7 @@ static int update_header(FILE *f)
        end = ftello(f);
        /* in a gsm WAV, data starts 60 bytes in */
        bytes = end - MSGSM_DATA_OFFSET;
-       samples = bytes / GSM_FRAME_SIZE * MSGSM_SAMPLES;
+       samples = bytes / MSGSM_FRAME_SIZE * MSGSM_SAMPLES;
        datalen = htoll((bytes + 1) & ~0x1);
        filelen = htoll(MSGSM_DATA_OFFSET - 8 + ((bytes + 1) & ~0x1));
        if (cur < 0) {
@@ -482,7 +482,7 @@ static int wav_write(struct ast_filestream *s, struct ast_frame *f)
                } else {        /* raw msgsm data */
                        src = f->data + len;
                }
-               if (src && (res = fwrite(src, 1, size, s->f)) != size) {
+               if (src && (res = fwrite(src, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) {
                        ast_log(LOG_WARNING, "Bad write (%d/65): %s\n", res, strerror(errno));
                        return -1;
                }