mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 18:58:22 +00:00
For the formats that support seek and/or truncate operations, many of the C library calls used to determine or set the current position indicator in the file stream were not being checked. In some situations, if an error occurred, a negative value would be returned from the library call. This could then be interpreted inappropriately as positional data. This patch checks the return values from these library calls before using them in subsequent operations. (issue ASTERISK-19655) Reported by: Matt Jordan Review: https://reviewboard.asterisk.org/r/1863/ ........ Merged revisions 362151 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 362152 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@362153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
166 lines
4.4 KiB
C
166 lines
4.4 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 1999 - 2005, Digium, Inc.
|
|
*
|
|
* Mark Spencer <markster@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Flat, binary, ADPCM vox file format.
|
|
* \arg File name extensions: vox
|
|
*
|
|
* \ingroup formats
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<support_level>extended</support_level>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include "asterisk/mod_format.h"
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/endian.h"
|
|
|
|
#define BUF_SIZE 80 /* 80 bytes, 160 samples */
|
|
#define VOX_SAMPLES 160
|
|
|
|
static struct ast_frame *vox_read(struct ast_filestream *s, int *whennext)
|
|
{
|
|
int res;
|
|
|
|
/* Send a frame from the file to the appropriate channel */
|
|
s->fr.frametype = AST_FRAME_VOICE;
|
|
ast_format_set(&s->fr.subclass.format, AST_FORMAT_ADPCM, 0);
|
|
s->fr.mallocd = 0;
|
|
AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
|
|
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) {
|
|
if (res)
|
|
ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
|
|
return NULL;
|
|
}
|
|
*whennext = s->fr.samples = res * 2;
|
|
s->fr.datalen = res;
|
|
return &s->fr;
|
|
}
|
|
|
|
static int vox_write(struct ast_filestream *s, struct ast_frame *f)
|
|
{
|
|
int res;
|
|
if (f->frametype != AST_FRAME_VOICE) {
|
|
ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
|
|
return -1;
|
|
}
|
|
if (f->subclass.format.id != AST_FORMAT_ADPCM) {
|
|
ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%s)!\n", ast_getformatname(&f->subclass.format));
|
|
return -1;
|
|
}
|
|
if ((res = fwrite(f->data.ptr, 1, f->datalen, s->f)) != f->datalen) {
|
|
ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", res, f->datalen, strerror(errno));
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int vox_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
|
|
{
|
|
off_t offset = 0, min = 0, cur, max, distance;
|
|
|
|
if ((cur = ftello(fs->f)) < 0) {
|
|
ast_log(AST_LOG_WARNING, "Unable to determine current position in g719 filestream %p: %s\n", fs, strerror(errno));
|
|
return -1;
|
|
}
|
|
|
|
if (fseeko(fs->f, 0, SEEK_END) < 0) {
|
|
ast_log(AST_LOG_WARNING, "Unable to seek to end of g719 filestream %p: %s\n", fs, strerror(errno));
|
|
return -1;
|
|
}
|
|
|
|
if ((max = ftello(fs->f) < 0)) {
|
|
ast_log(AST_LOG_WARNING, "Unable to determine max position in g719 filestream %p: %s\n", fs, strerror(errno));
|
|
return -1;
|
|
}
|
|
|
|
/* have to fudge to frame here, so not fully to sample */
|
|
distance = sample_offset/2;
|
|
if (whence == SEEK_SET) {
|
|
offset = distance;
|
|
} else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) {
|
|
offset = distance + cur;
|
|
} else if (whence == SEEK_END) {
|
|
offset = max - distance;
|
|
}
|
|
if (whence != SEEK_FORCECUR) {
|
|
offset = (offset > max)?max:offset;
|
|
offset = (offset < min)?min:offset;
|
|
}
|
|
return fseeko(fs->f, offset, SEEK_SET);
|
|
}
|
|
|
|
static int vox_trunc(struct ast_filestream *fs)
|
|
{
|
|
int fd;
|
|
off_t cur;
|
|
|
|
if ((fd = fileno(fs->f)) < 0) {
|
|
ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for vox filestream %p: %s\n", fs, strerror(errno));
|
|
return -1;
|
|
}
|
|
if ((cur = ftello(fs->f) < 0)) {
|
|
ast_log(AST_LOG_WARNING, "Unable to determine current position in vox filestream %p: %s\n", fs, strerror(errno));
|
|
return -1;
|
|
}
|
|
/* Truncate file to current length */
|
|
return ftruncate(fd, cur);}
|
|
|
|
static off_t vox_tell(struct ast_filestream *fs)
|
|
{
|
|
off_t offset;
|
|
offset = ftello(fs->f) << 1;
|
|
return offset;
|
|
}
|
|
|
|
static struct ast_format_def vox_f = {
|
|
.name = "vox",
|
|
.exts = "vox",
|
|
.write = vox_write,
|
|
.seek = vox_seek,
|
|
.trunc = vox_trunc,
|
|
.tell = vox_tell,
|
|
.read = vox_read,
|
|
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
|
|
};
|
|
|
|
static int load_module(void)
|
|
{
|
|
ast_format_set(&vox_f.format, AST_FORMAT_ADPCM, 0);
|
|
if (ast_format_def_register(&vox_f))
|
|
return AST_MODULE_LOAD_FAILURE;
|
|
return AST_MODULE_LOAD_SUCCESS;
|
|
}
|
|
|
|
static int unload_module(void)
|
|
{
|
|
return ast_format_def_unregister(vox_f.name);
|
|
}
|
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format",
|
|
.load = load_module,
|
|
.unload = unload_module,
|
|
.load_pri = AST_MODPRI_APP_DEPEND
|
|
);
|