Mark Michelson fc7455fa44 Merged revisions 171621 via svnmerge from ...

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

........
r171621 | mmichelson | 2009-01-27 14:06:01 -0600 (Tue, 27 Jan 2009) | 18 lines

Prevent a crash from occurring when a jitter buffer interpolated frame is
removed from a slinfactory

slinfactory used the "samples" field of an ast_frame in order to determine
the amount of data contained within the frame. In certain cases, such as
jitter buffer interpolated frames, the frame would have a non-zero value for
"samples" but have NULL "data"

This caused a problem when a memcpy call in ast_slinfactory_read would attempt
to access invalid memory. The solution in use here is to never feed frames into
the slinfactory if they have NULL "data"

(closes issue #13116)
Reported by: aragon
Patches:
      13116.diff uploaded by putnopvut (license 60)


........


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

2009-01-27 20:11:30 +00:00

..

db1-ast

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

editline

Merged revisions 163761 via svnmerge from

2008-12-12 22:04:26 +00:00

stdtime

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

abstract_jb.c

Create logfile safely.

2009-01-22 21:25:46 +00:00

acl.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

adsistub.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

app.c

Merged revisions 168561 via svnmerge from

2009-01-13 19:22:13 +00:00

ast_expr2.c

This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.

2009-01-15 20:54:59 +00:00

ast_expr2.fl

Merged revisions 144924-144925 via svnmerge from

2008-09-27 15:52:56 +00:00

ast_expr2.h

This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.

2009-01-15 20:54:59 +00:00

ast_expr2.y

This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.

2009-01-15 20:54:59 +00:00

ast_expr2f.c

bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too

2008-11-02 18:52:13 +00:00

asterisk.c

Merged revisions 169722 via svnmerge from

2009-01-21 21:03:40 +00:00

astmm.c

Janitor, use ARRAY_LEN() when possible.

2008-12-05 10:31:25 +00:00

astobj2.c

Remove some error messages. This is the default handler that is valid to use.

2008-12-22 17:44:23 +00:00

audiohook.c

Get rid of an extra space.

2008-12-19 23:45:00 +00:00

autoservice.c

Merged revisions 163448 via svnmerge from

2008-12-12 13:55:30 +00:00

buildinfo.c

fix a few small things found by using sparse

2008-10-30 16:49:02 +00:00

callerid.c

Merged revisions 160943 via svnmerge from

2008-12-04 16:45:06 +00:00

cdr.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

channel.c

Add extensions and context on manager event when new channel is created.

2009-01-26 12:32:30 +00:00

chanvars.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

cli.c

Don't crash when typing 'core set verbose' or 'core set debug' by themselves.

2009-01-14 23:10:48 +00:00

config.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

cryptostub.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

cygload.c

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

datastore.c

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

db.c

Merged revisions 167299 via svnmerge from

2009-01-06 21:36:44 +00:00

devicestate.c

Slightly optimize ast_devstate_str and rename global functions devstate2str and config_text_file_save to have an ast_ prefix

2008-11-04 18:47:20 +00:00

dial.c

* Fixed timeout logic in the dialing API as setting timeouts

2008-10-31 20:05:46 +00:00

dns.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

dnsmgr.c

Record the previous port in the temporary address structure so that the comparison does not treat the host as having changed even if it did not. This would have been uninitialized before and would have led to a baddddd port.

2008-12-22 16:08:13 +00:00

dsp.c

Add an option, waitfordialtone, for UK analog lines which do not end a call

2008-11-25 22:45:59 +00:00

ecdisa.h

…

enum.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

event.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

features.c

Make a proper builtin attended transfer to parking work

2009-01-20 19:22:24 +00:00

file.c

Merged revisions 167566 via svnmerge from

2009-01-07 22:36:34 +00:00

fixedjitterbuf.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

2008-08-06 00:30:53 +00:00

frame.c

Make sure we handle a uint32_t payload in ast_frdup()

2008-12-15 21:53:30 +00:00

fskmodem_float.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem_int.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem.c

(Step 2 of 2)

2008-07-21 21:00:47 +00:00

global_datastores.c

Asterisk, when parking can drop rights a caller when a parking timeout occurs. Also, when doing built-in attended transfers, sometimes incorrectly passes rights from the transferrer to the transferee. This patch tries to fixes the parking issue and lays some groundwork for later fixing the transfer issue.

2008-03-01 01:30:37 +00:00

hashtab.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

http.c

Fix qualify for TCP peer

2009-01-17 01:56:36 +00:00

image.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

indications.c

Merged revisions 168561 via svnmerge from

2009-01-13 19:22:13 +00:00

io.c

Merged revisions 94977 via svnmerge from

2007-12-27 20:11:20 +00:00

jitterbuf.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

loader.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

logger.c

Added a comment to logger.c about where to put includes

2009-01-09 18:01:26 +00:00

Makefile

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

manager.c

Merged revisions 169364 via svnmerge from

2009-01-19 20:05:52 +00:00

md5.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

netsock.c

Make OpenBSD compile again

2008-06-19 20:25:37 +00:00

pbx.c

Merged revisions 170050 via svnmerge from

2009-01-22 15:14:50 +00:00

plc.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

poll.c

Merged revisions 140816 via svnmerge from

2008-09-03 13:26:43 +00:00

privacy.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

rtp.c

Merged revisions 170239 via svnmerge from

2009-01-22 20:04:39 +00:00

say.c

Fix a crash when saying certain numbers in Chinese

2009-01-21 22:10:02 +00:00

sched.c

Merged revisions 142354 via svnmerge from

2008-09-10 16:41:55 +00:00

sha1.c

more header removal/normalization

2007-11-21 00:23:49 +00:00

slinfactory.c

Merged revisions 171621 via svnmerge from

2009-01-27 20:11:30 +00:00

srv.c

bump the verbosity of a message in srv.c up by one. It used to be

2009-01-12 23:12:30 +00:00

strcompat.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

strings.c

Remove duplicate code from the ast_str API. We now use __AST_STR_* to

2008-12-18 15:25:15 +00:00

taskprocessor.c

correct a CLI description

2009-01-13 16:02:13 +00:00

tcptls.c

Fix a regression in TCP support.

2009-01-21 10:26:07 +00:00

tdd.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

term.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

threadstorage.c

Merged revisions 164736 via svnmerge from

2008-12-16 17:14:01 +00:00

timing.c

- add get_max_rate timing API call

2008-06-26 15:37:01 +00:00

translate.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

udptl.c

Merged revisions 168603 via svnmerge from

2009-01-14 19:11:14 +00:00

ulaw.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

utils.c

Merged revisions 166297 via svnmerge from

2008-12-22 17:29:10 +00:00

xml.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

xmldoc.c

Don't forget to free typename

2008-12-31 22:53:55 +00:00