[asterisk-commits] rmudgett: branch 1.8 r368039 - in /branches/1.8: apps/ channels/ funcs/ main/...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 31 13:01:03 CDT 2012
Author: rmudgett
Date: Thu May 31 13:00:59 2012
New Revision: 368039
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368039
Log:
Coverity Report: Fix issues for error type REVERSE_INULL (core modules)
* Fixes findings: 0-2,5,7-15,24-26,28-31
(issue ASTERISK-19648)
Reported by: Matt Jordan
Modified:
branches/1.8/apps/app_queue.c
branches/1.8/channels/chan_agent.c
branches/1.8/channels/chan_iax2.c
branches/1.8/channels/chan_sip.c
branches/1.8/funcs/func_math.c
branches/1.8/main/db1-ast/btree/bt_open.c
branches/1.8/main/features.c
branches/1.8/main/manager.c
branches/1.8/main/tcptls.c
branches/1.8/pbx/pbx_config.c
branches/1.8/res/ael/pval.c
branches/1.8/res/res_config_odbc.c
Modified: branches/1.8/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_queue.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/apps/app_queue.c (original)
+++ branches/1.8/apps/app_queue.c Thu May 31 13:00:59 2012
@@ -2492,11 +2492,11 @@
*/
if (!inserted && (qe->prio >= cur->prio) && position && (position <= pos + 1)) {
insert_entry(q, prev, qe, &pos);
+ inserted = 1;
/*pos is incremented inside insert_entry, so don't need to add 1 here*/
if (position < pos) {
ast_log(LOG_NOTICE, "Asked to be inserted at position %d but forced into position %d due to higher priority callers\n", position, pos);
}
- inserted = 1;
}
cur->pos = ++pos;
prev = cur;
@@ -5992,6 +5992,8 @@
set_queue_result(chan, reason);
return 0;
}
+ ast_assert(qe.parent != NULL);
+
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ENTERQUEUE", "%s|%s|%d",
S_OR(args.url, ""),
S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""),
@@ -6146,12 +6148,13 @@
if (reason != QUEUE_UNKNOWN)
set_queue_result(chan, reason);
- if (qe.parent) {
- /* every queue_ent is given a reference to it's parent call_queue when it joins the queue.
- * This ref must be taken away right before the queue_ent is destroyed. In this case
- * the queue_ent is about to be returned on the stack */
- qe.parent = queue_unref(qe.parent);
- }
+ /*
+ * every queue_ent is given a reference to it's parent
+ * call_queue when it joins the queue. This ref must be taken
+ * away right before the queue_ent is destroyed. In this case
+ * the queue_ent is about to be returned on the stack
+ */
+ qe.parent = queue_unref(qe.parent);
return res;
}
Modified: branches/1.8/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_agent.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/channels/chan_agent.c (original)
+++ branches/1.8/channels/chan_agent.c Thu May 31 13:00:59 2012
@@ -517,21 +517,27 @@
/*!
* Deletes an agent after doing some clean up.
* Further documentation: How safe is this function ? What state should the agent be to be cleaned.
+ *
+ * \warning XXX This function seems to be very unsafe.
+ * Potential for double free and use after free among other
+ * problems.
+ *
* \param p Agent to be deleted.
* \returns Always 0.
*/
static int agent_cleanup(struct agent_pvt *p)
{
- struct ast_channel *chan = NULL;
+ struct ast_channel *chan;
+
ast_mutex_lock(&p->lock);
chan = p->owner;
p->owner = NULL;
- chan->tech_pvt = NULL;
/* Release ownership of the agent to other threads (presumably running the login app). */
p->app_sleep_cond = 1;
p->app_lock_flag = 0;
ast_cond_signal(&p->app_complete_cond);
if (chan) {
+ chan->tech_pvt = NULL;
chan = ast_channel_release(chan);
}
if (p->dead) {
@@ -540,7 +546,9 @@
ast_cond_destroy(&p->app_complete_cond);
ast_cond_destroy(&p->login_wait_cond);
ast_free(p);
- }
+ } else {
+ ast_mutex_unlock(&p->lock);
+ }
return 0;
}
Modified: branches/1.8/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_iax2.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/channels/chan_iax2.c (original)
+++ branches/1.8/channels/chan_iax2.c Thu May 31 13:00:59 2012
@@ -2404,19 +2404,20 @@
.sin_addr.s_addr = peercnt->addr,
};
- if (peercnt) {
- /* Container locked here since peercnt may be unlinked from list. If left unlocked,
- * peercnt_add could try and grab this entry from the table and modify it at the
- * "same time" this thread attemps to unlink it.*/
- ao2_lock(peercnts);
- peercnt->cur--;
- ast_debug(1, "ip callno count decremented to %d for %s\n", peercnt->cur, ast_inet_ntoa(sin.sin_addr));
- /* if this was the last connection from the peer remove it from table */
- if (peercnt->cur == 0) {
- ao2_unlink(peercnts, peercnt);/* decrements ref from table, last ref is left to scheduler */
- }
- ao2_unlock(peercnts);
- }
+ /*
+ * Container locked here since peercnt may be unlinked from
+ * list. If left unlocked, peercnt_add could try and grab this
+ * entry from the table and modify it at the "same time" this
+ * thread attemps to unlink it.
+ */
+ ao2_lock(peercnts);
+ peercnt->cur--;
+ ast_debug(1, "ip callno count decremented to %d for %s\n", peercnt->cur, ast_inet_ntoa(sin.sin_addr));
+ /* if this was the last connection from the peer remove it from table */
+ if (peercnt->cur == 0) {
+ ao2_unlink(peercnts, peercnt);/* decrements ref from table, last ref is left to scheduler */
+ }
+ ao2_unlock(peercnts);
}
/*!
@@ -5914,16 +5915,15 @@
The "genuine" distinction is needed because genuine frames must get a clock-based timestamp,
the others need a timestamp slaved to the voice frames so that they go in sequence
*/
- if (f) {
- if (f->frametype == AST_FRAME_VOICE) {
- voice = 1;
- delivery = &f->delivery;
- } else if (f->frametype == AST_FRAME_IAX) {
- genuine = 1;
- } else if (f->frametype == AST_FRAME_CNG) {
- p->notsilenttx = 0;
- }
- }
+ if (f->frametype == AST_FRAME_VOICE) {
+ voice = 1;
+ delivery = &f->delivery;
+ } else if (f->frametype == AST_FRAME_IAX) {
+ genuine = 1;
+ } else if (f->frametype == AST_FRAME_CNG) {
+ p->notsilenttx = 0;
+ }
+
if (ast_tvzero(p->offset)) {
p->offset = ast_tvnow();
/* Round to nearest 20ms for nice looking traces */
Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Thu May 31 13:00:59 2012
@@ -6384,31 +6384,27 @@
ast_channel_unlock(bridge);
}
- if (p->do_history || oldowner) {
- if (p->rtp && (quality = ast_rtp_instance_get_quality(p->rtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
- if (p->do_history) {
- append_history(p, "RTCPaudio", "Quality:%s", quality);
- }
- if (oldowner) {
- pbx_builtin_setvar_helper(oldowner, "RTPAUDIOQOS", quality);
- }
+ /*
+ * The channel variables are set below just to get the AMI
+ * VarSet event because the channel is being hungup.
+ */
+ if (p->rtp && (quality = ast_rtp_instance_get_quality(p->rtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
+ if (p->do_history) {
+ append_history(p, "RTCPaudio", "Quality:%s", quality);
}
- if (p->vrtp && (quality = ast_rtp_instance_get_quality(p->vrtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
- if (p->do_history) {
- append_history(p, "RTCPvideo", "Quality:%s", quality);
- }
- if (oldowner) {
- pbx_builtin_setvar_helper(oldowner, "RTPVIDEOQOS", quality);
- }
+ pbx_builtin_setvar_helper(oldowner, "RTPAUDIOQOS", quality);
+ }
+ if (p->vrtp && (quality = ast_rtp_instance_get_quality(p->vrtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
+ if (p->do_history) {
+ append_history(p, "RTCPvideo", "Quality:%s", quality);
}
- if (p->trtp && (quality = ast_rtp_instance_get_quality(p->trtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
- if (p->do_history) {
- append_history(p, "RTCPtext", "Quality:%s", quality);
- }
- if (oldowner) {
- pbx_builtin_setvar_helper(oldowner, "RTPTEXTQOS", quality);
- }
+ pbx_builtin_setvar_helper(oldowner, "RTPVIDEOQOS", quality);
+ }
+ if (p->trtp && (quality = ast_rtp_instance_get_quality(p->trtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
+ if (p->do_history) {
+ append_history(p, "RTCPtext", "Quality:%s", quality);
}
+ pbx_builtin_setvar_helper(oldowner, "RTPTEXTQOS", quality);
}
/* Send a hangup */
@@ -24883,9 +24879,10 @@
}
}
- if (!req->ignore && p)
+ if (!req->ignore) {
p->lastinvite = seqno;
- if (p && !p->needdestroy) {
+ }
+ if (!p->needdestroy) {
p->expiry = atoi(get_header(req, "Expires"));
/* check if the requested expiry-time is within the approved limits from sip.conf */
Modified: branches/1.8/funcs/func_math.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/funcs/func_math.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/funcs/func_math.c (original)
+++ branches/1.8/funcs/func_math.c Thu May 31 13:00:59 2012
@@ -57,7 +57,7 @@
<replaceable>number1</replaceable><replaceable>op</replaceable><replaceable>number2</replaceable>
where the possible values for <replaceable>op</replaceable>
are:</para>
- <para>+,-,/,*,%,<<,>>,^,AND,OR,XOR,<,%gt;,>=,<=,== (and behave as their C equivalents)</para>
+ <para>+,-,/,*,%,<<,>>,^,AND,OR,XOR,<,>,<=,>=,== (and behave as their C equivalents)</para>
</parameter>
<parameter name="type">
<para>Wanted type of result:</para>
@@ -254,7 +254,7 @@
}
}
- if (!mvalue1 || !mvalue2) {
+ if (!mvalue2) {
ast_log(LOG_WARNING,
"Supply all the parameters - just this once, please\n");
return -1;
Modified: branches/1.8/main/db1-ast/btree/bt_open.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/db1-ast/btree/bt_open.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/main/db1-ast/btree/bt_open.c (original)
+++ branches/1.8/main/db1-ast/btree/bt_open.c Thu May 31 13:00:59 2012
@@ -404,7 +404,7 @@
#else
path = malloc(n);
#endif
- (void)snprintf(path, n, fmt, envtmp ? envtmp : "/tmp");
+ (void)snprintf(path, n, fmt, envtmp);
(void)sigfillset(&set);
(void)sigprocmask(SIG_BLOCK, &set, &oset);
Modified: branches/1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/features.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/main/features.c (original)
+++ branches/1.8/main/features.c Thu May 31 13:00:59 2012
@@ -2076,10 +2076,7 @@
}
set_peers(&caller_chan, &callee_chan, peer, chan, sense);
- if (!caller_chan || !callee_chan) {
- ast_log(LOG_NOTICE,"Cannot record the call. One or both channels have gone away.\n");
- return -1;
- }
+
/* Find extra messages */
automon_message_start = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MONITOR_MESSAGE_START");
automon_message_stop = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MONITOR_MESSAGE_STOP");
@@ -2155,6 +2152,8 @@
size_t len;
struct ast_channel *caller_chan, *callee_chan;
const char *mixmonitor_spy_type = "MixMonitor";
+ const char *touch_format;
+ const char *touch_monitor;
int count = 0;
if (!mixmonitor_ok) {
@@ -2189,7 +2188,6 @@
/* This means a mixmonitor is attached to the channel, running or not is unknown. */
if (count > 0) {
-
ast_verb(3, "User hit '%s' to stop recording call.\n", code);
/* Make sure they are running */
@@ -2214,51 +2212,44 @@
ast_log(LOG_WARNING,"Stopped MixMonitors are attached to the channel.\n");
}
- if (caller_chan && callee_chan) {
- const char *touch_format = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MIXMONITOR_FORMAT");
- const char *touch_monitor = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MIXMONITOR");
-
- if (!touch_format)
- touch_format = pbx_builtin_getvar_helper(callee_chan, "TOUCH_MIXMONITOR_FORMAT");
-
- if (!touch_monitor)
- touch_monitor = pbx_builtin_getvar_helper(callee_chan, "TOUCH_MIXMONITOR");
-
- if (touch_monitor) {
- len = strlen(touch_monitor) + 50;
- args = alloca(len);
- touch_filename = alloca(len);
- snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor);
- snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
- } else {
- caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
- caller_chan->caller.id.number.str, caller_chan->name));
- callee_chan_id = ast_strdupa(S_COR(callee_chan->caller.id.number.valid,
- callee_chan->caller.id.number.str, callee_chan->name));
- len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
- args = alloca(len);
- touch_filename = alloca(len);
- snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id);
- snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
- }
-
- for( x = 0; x < strlen(args); x++) {
- if (args[x] == '/')
- args[x] = '-';
- }
-
- ast_verb(3, "User hit '%s' to record call. filename: %s\n", code, touch_filename);
-
- pbx_exec(callee_chan, mixmonitor_app, args);
- pbx_builtin_setvar_helper(callee_chan, "TOUCH_MIXMONITOR_OUTPUT", touch_filename);
- pbx_builtin_setvar_helper(caller_chan, "TOUCH_MIXMONITOR_OUTPUT", touch_filename);
- return AST_FEATURE_RETURN_SUCCESS;
-
- }
-
- ast_log(LOG_NOTICE,"Cannot record the call. One or both channels have gone away.\n");
- return -1;
-
+ touch_format = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MIXMONITOR_FORMAT");
+ touch_monitor = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MIXMONITOR");
+
+ if (!touch_format)
+ touch_format = pbx_builtin_getvar_helper(callee_chan, "TOUCH_MIXMONITOR_FORMAT");
+
+ if (!touch_monitor)
+ touch_monitor = pbx_builtin_getvar_helper(callee_chan, "TOUCH_MIXMONITOR");
+
+ if (touch_monitor) {
+ len = strlen(touch_monitor) + 50;
+ args = alloca(len);
+ touch_filename = alloca(len);
+ snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor);
+ snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
+ } else {
+ caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
+ caller_chan->caller.id.number.str, caller_chan->name));
+ callee_chan_id = ast_strdupa(S_COR(callee_chan->caller.id.number.valid,
+ callee_chan->caller.id.number.str, callee_chan->name));
+ len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
+ args = alloca(len);
+ touch_filename = alloca(len);
+ snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id);
+ snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
+ }
+
+ for( x = 0; x < strlen(args); x++) {
+ if (args[x] == '/')
+ args[x] = '-';
+ }
+
+ ast_verb(3, "User hit '%s' to record call. filename: %s\n", code, touch_filename);
+
+ pbx_exec(callee_chan, mixmonitor_app, args);
+ pbx_builtin_setvar_helper(callee_chan, "TOUCH_MIXMONITOR_OUTPUT", touch_filename);
+ pbx_builtin_setvar_helper(caller_chan, "TOUCH_MIXMONITOR_OUTPUT", touch_filename);
+ return AST_FEATURE_RETURN_SUCCESS;
}
static int builtin_disconnect(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, const char *code, int sense, void *data)
@@ -2480,6 +2471,8 @@
struct ast_channel *transferer;/* Party B */
struct ast_channel *transferee;/* Party A */
struct ast_exten *park_exten;
+ const char *chan1_attended_sound;
+ const char *chan2_attended_sound;
const char *transferer_real_context;
char xferto[256] = "";
int res;
@@ -2552,16 +2545,13 @@
/* If we are performing an attended transfer and we have two channels involved then
copy sound file information to play upon attended transfer completion */
- if (transferee) {
- const char *chan1_attended_sound = pbx_builtin_getvar_helper(transferer, "ATTENDED_TRANSFER_COMPLETE_SOUND");
- const char *chan2_attended_sound = pbx_builtin_getvar_helper(transferee, "ATTENDED_TRANSFER_COMPLETE_SOUND");
-
- if (!ast_strlen_zero(chan1_attended_sound)) {
- pbx_builtin_setvar_helper(transferer, "BRIDGE_PLAY_SOUND", chan1_attended_sound);
- }
- if (!ast_strlen_zero(chan2_attended_sound)) {
- pbx_builtin_setvar_helper(transferee, "BRIDGE_PLAY_SOUND", chan2_attended_sound);
- }
+ chan1_attended_sound = pbx_builtin_getvar_helper(transferer, "ATTENDED_TRANSFER_COMPLETE_SOUND");
+ chan2_attended_sound = pbx_builtin_getvar_helper(transferee, "ATTENDED_TRANSFER_COMPLETE_SOUND");
+ if (!ast_strlen_zero(chan1_attended_sound)) {
+ pbx_builtin_setvar_helper(transferer, "BRIDGE_PLAY_SOUND", chan1_attended_sound);
+ }
+ if (!ast_strlen_zero(chan2_attended_sound)) {
+ pbx_builtin_setvar_helper(transferee, "BRIDGE_PLAY_SOUND", chan2_attended_sound);
}
/* Extract redial transferer information from the channel name. */
Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Thu May 31 13:00:59 2012
@@ -6119,7 +6119,7 @@
ast_md5_hash(resp_hash, resp);
}
- if (!d.nonce || strncasecmp(d.response, resp_hash, strlen(resp_hash))) {
+ if (strncasecmp(d.response, resp_hash, strlen(resp_hash))) {
/* Something was wrong, so give the client to try with a new challenge */
AST_RWLIST_UNLOCK(&users);
nonce = 0;
Modified: branches/1.8/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/tcptls.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/main/tcptls.c (original)
+++ branches/1.8/main/tcptls.c Thu May 31 13:00:59 2012
@@ -245,10 +245,11 @@
return NULL;
}
- if (tcptls_session && tcptls_session->parent->worker_fn)
+ if (tcptls_session->parent->worker_fn) {
return tcptls_session->parent->worker_fn(tcptls_session);
- else
+ } else {
return tcptls_session;
+ }
}
void *ast_tcptls_server_root(void *data)
@@ -443,9 +444,7 @@
close(desc->accept_fd);
desc->accept_fd = -1;
}
- if (tcptls_session) {
- ao2_ref(tcptls_session, -1);
- }
+ ao2_ref(tcptls_session, -1);
return NULL;
}
Modified: branches/1.8/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/pbx/pbx_config.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/pbx/pbx_config.c (original)
+++ branches/1.8/pbx/pbx_config.c Thu May 31 13:00:59 2012
@@ -1356,8 +1356,13 @@
static char *pbx_strsep(char **destructible, const char *delim)
{
int square = 0;
- char *res = *destructible;
- for (; destructible && *destructible && **destructible; (*destructible)++) {
+ char *res;
+
+ if (!destructible || !*destructible) {
+ return NULL;
+ }
+ res = *destructible;
+ for (; **destructible; (*destructible)++) {
if (**destructible == '[' && !strchr(delim, '[')) {
square++;
} else if (**destructible == ']' && !strchr(delim, ']')) {
@@ -1372,7 +1377,7 @@
break;
}
}
- if (destructible && *destructible && **destructible == '\0') {
+ if (**destructible == '\0') {
*destructible = NULL;
}
return res;
@@ -1582,7 +1587,7 @@
v->lineno, vfile);
}
}
- free(tc);
+ ast_free(tc);
} else if (!strcasecmp(v->name, "include")) {
pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
if (ast_context_add_include2(con, realvalue, registrar)) {
Modified: branches/1.8/res/ael/pval.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/ael/pval.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/res/ael/pval.c (original)
+++ branches/1.8/res/ael/pval.c Thu May 31 13:00:59 2012
@@ -1223,21 +1223,24 @@
return x;
}
}
- return 0;
+ return NULL;
}
static void check_goto(pval *item)
{
+ if (!item->u1.list) {
+ return;
+ }
+
/* check for the target of the goto-- does it exist? */
if ( !(item->u1.list)->next && !(item->u1.list)->u1.str ) {
ast_log(LOG_ERROR,"Error: file %s, line %d-%d: goto: empty label reference found!\n",
item->filename, item->startline, item->endline);
errs++;
}
-
+
/* just one item-- the label should be in the current extension */
-
- if (item->u1.list && !item->u1.list->next && !strstr((item->u1.list)->u1.str,"${")) {
+ if (!item->u1.list->next && !strstr(item->u1.list->u1.str,"${")) {
struct pval *z = get_extension_or_contxt(item);
struct pval *x = 0;
if (z)
Modified: branches/1.8/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_config_odbc.c?view=diff&rev=368039&r1=368038&r2=368039
==============================================================================
--- branches/1.8/res/res_config_odbc.c (original)
+++ branches/1.8/res/res_config_odbc.c Thu May 31 13:00:59 2012
@@ -317,7 +317,7 @@
char sql[1024];
char coltitle[256];
char rowdata[2048];
- const char *initfield=NULL;
+ const char *initfield;
char *op;
const char *newparam;
char *stringp;
@@ -375,9 +375,7 @@
}
va_end(aq);
- if (initfield) {
- snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield);
- }
+ snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield);
va_copy(cps.ap, ap);
stmt = ast_odbc_prepare_and_execute(obj, custom_prepare, &cps);
@@ -447,7 +445,7 @@
if (strchr(chunk, '^')) {
decode_chunk(chunk);
}
- if (initfield && !strcmp(initfield, coltitle)) {
+ if (!strcmp(initfield, coltitle)) {
ast_category_rename(cat, chunk);
}
var = ast_variable_new(coltitle, chunk, "");
More information about the asterisk-commits
mailing list