Summary:	ASTERISK-06271: [patch] function returns incorrect value
Reporter:	zoa (zoa)	Labels:
Date Opened:	2006-02-07 11:04:25.000-0600	Date Closed:	2008-01-15 16:34:33.000-0600
Priority:	Trivial	Regression?	No
Status:	Closed/Complete	Components:	Core/General
Versions:		Frequency of Occurrence
Related Issues:
Environment:		Attachments:	( 0) chan_zap.patch
Description:	From the mailinglist On Tue, 2006-02-07 at 17:19 +0200, Slav Klenov wrote: >> In function >> static struct zt_pvt *mkintf(int channel, int signalling, int radio, >> struct zt_pri *pri, int reloading) >> in chan_zap.c line 7035 (svn trunk from today) we have: >> >>     if (p.sigtype != (signalling & 0x3ffff)) { >>         ast_log(LOG_ERROR, "Signalling requested on channel %d is %s but >> line is in %s signalling\n", channel, sig2str(signalling), >> sig2str(p.sigtype)); >>         destroy_zt_pvt(&tmp); >>         return tmp; >>     } >> >> Shouldn't we return NULL in this case? Thanks for your help! Please open a bug ticket at http://bugs.digium.com/ so that this can be tracked and corrected if it needs to be.  This way, it won't get lost. -Jared ****** ADDITIONAL INFORMATION ****** Im the copyright holder of this patch and have a disclaimer on file.
Comments:	By: zoa (zoa) 2006-02-08 08:44:31.000-0600 hmm ,slav just asked me to place this in channel drivers instead of zaptel, but i cant find how to do that :( Could somebody with more privileges than me do that ? By: Russell Bryant (russell) 2006-02-08 18:52:59.000-0600 destroy_zt_pvt() actually sets tmp to NULL, so the two things are functionally equivalent. I have made this change in the trunk (rev 9248) for the sake of clarity, but not in 1.2. Thanks! By: Digium Subversion (svnbot) 2008-01-15 16:34:10.000-0600 Repository: asterisk Revision: 9248 U   trunk/channels/chan_zap.c ------------------------------------------------------------------------ r9248 | russell | 2008-01-15 16:34:09 -0600 (Tue, 15 Jan 2008) | 2 lines clarify return value (issue ASTERISK-6271) ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=9248 By: Digium Subversion (svnbot) 2008-01-15 16:34:33.000-0600 Repository: asterisk Revision: 9275 _U  team/oej/astum/ U   team/oej/astum/Makefile U   team/oej/astum/apps/Makefile U   team/oej/astum/apps/app_macro.c U   team/oej/astum/cdr/Makefile U   team/oej/astum/channels/chan_iax2.c U   team/oej/astum/channels/chan_misdn.c U   team/oej/astum/channels/chan_misdn_config.c U   team/oej/astum/channels/chan_oss.c U   team/oej/astum/channels/chan_zap.c U   team/oej/astum/channels/misdn/Makefile U   team/oej/astum/channels/misdn/isdn_lib.c U   team/oej/astum/channels/misdn/isdn_lib_intern.h U   team/oej/astum/channels/misdn/isdn_msg_parser.c U   team/oej/astum/configs/misdn.conf.sample U   team/oej/astum/dsp.c U   team/oej/astum/enum.c U   team/oej/astum/file.c U   team/oej/astum/include/asterisk/sha1.h U   team/oej/astum/logger.c U   team/oej/astum/sha1.c ------------------------------------------------------------------------ r9275 | oej | 2008-01-15 16:34:33 -0600 (Tue, 15 Jan 2008) | 129 lines Merged revisions 9150,9157,9163,9166,9186,9194,9215,9223,9225,9238-9239,9247-9248,9259-9261,9263 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r9150 | russell | 2006-02-04 17:32:27 +0100 (Sat, 04 Feb 2006) | 2 lines remove windows-style line endings ................ r9157 | tilghman | 2006-02-05 18:20:29 +0100 (Sun, 05 Feb 2006) | 10 lines Merged revisions 9156 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r9156 | tilghman | 2006-02-05 11:10:19 -0600 (Sun, 05 Feb 2006) | 2 lines Bug 6176 - Fix race condition ........ ................ r9163 | kpfleming | 2006-02-06 21:18:17 +0100 (Mon, 06 Feb 2006) | 2 lines rename properties for forward-porting fixes so they don't conflict with developer branches ................ r9166 | kpfleming | 2006-02-06 21:30:49 +0100 (Mon, 06 Feb 2006) | 2 lines minor cleanup ................ r9186 | crichter | 2006-02-07 14:34:59 +0100 (Tue, 07 Feb 2006) | 1 line default values of jitterbuffer and jitterbuffer_upper_threshold should be > 0, this fixes the tv_fix warnings, because we use ast_read to transmit frames to asterisk in jitterbuffer mode, instead of queueing the audio data with ast_queue_frame. ................ r9194 | mattf | 2006-02-07 19:00:42 +0100 (Tue, 07 Feb 2006) | 2 lines Make sure we output the APDU debug on pri debug commands ................ r9215 | crichter | 2006-02-08 17:10:21 +0100 (Wed, 08 Feb 2006) | 8 lines * dozens of white-space removements * some // comment removements * debugging optimization, use port where possible * fixed  pickup problem (pickup didn't work anymore after mqueue) * removed some mIDSN_JOLLY defines which are not needed anymore in mqueue * adapted the new cli.h constifications ................ r9223 | crichter | 2006-02-08 20:39:37 +0100 (Wed, 08 Feb 2006) | 1 line L2 Signalling in PTP-TE Mode fixed ................ r9225 | crichter | 2006-02-08 20:51:53 +0100 (Wed, 08 Feb 2006) | 1 line fix for the L2 Signalling ................ r9238 | tilghman | 2006-02-09 00:10:39 +0100 (Thu, 09 Feb 2006) | 10 lines Merged revisions 9233 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r9233 | tilghman | 2006-02-08 16:34:38 -0600 (Wed, 08 Feb 2006) | 2 lines Leave it to RH/CentOS to put the freetds headers in a completely nonstandard location. ........ ................ r9239 | mogorman | 2006-02-09 00:14:17 +0100 (Thu, 09 Feb 2006) | 12 lines Merged revisions 9232 via svnmerge from https://svn.digium.com/svn/asterisk/branches/1.2 ........ r9232 | mogorman | 2006-02-08 16:12:34 -0600 (Wed, 08 Feb 2006) | 4 lines Make logger report error,warning,notice if logger.conf not found, also updated chan_oss to give correct error message if its config file is not found. ........ ................ r9247 | russell | 2006-02-09 02:33:50 +0100 (Thu, 09 Feb 2006) | 10 lines Merged revisions 9246 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r9246 | russell | 2006-02-08 20:24:55 -0500 (Wed, 08 Feb 2006) | 2 lines reload peercontext on iax2 reload (issue ASTERISK-6279) ........ ................ r9248 | russell | 2006-02-09 02:52:09 +0100 (Thu, 09 Feb 2006) | 2 lines clarify return value (issue ASTERISK-6271) ................ r9259 | russell | 2006-02-09 03:08:04 +0100 (Thu, 09 Feb 2006) | 4 lines various code cleanup changes including changing #define'd constants to enums, comments to doxygen style, memory allocation to use ast_ wrappers, use calloc instead of malloc+memset, and removing duplicated error messages (issue ASTERISK-6272) ................ r9260 | russell | 2006-02-09 03:21:57 +0100 (Thu, 09 Feb 2006) | 3 lines remove unnecessary format check in zt_request so that we will actually accept a requested format of ALAW (issue ASTERISK-6259, different patch) ................ r9261 | russell | 2006-02-09 03:27:30 +0100 (Thu, 09 Feb 2006) | 2 lines remove some Makefile targets for things that don't exist in the tree ................ r9263 | russell | 2006-02-09 03:35:34 +0100 (Thu, 09 Feb 2006) | 1 line ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=9275