<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14440] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14440">14440</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-31 14:29:39 -0500 (Fri, 31 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix msvc code analysis warnings (multiple null deref bugs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-07-31 19:14:56 UTC (rev 14439)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-07-31 19:29:39 UTC (rev 14440)
</span><span class="lines">@@ -47,11 +47,11 @@
</span><span class="cx"> #else /* */
</span><span class="cx"> #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
</span><span class="cx"> #endif /* */
</span><del>-struct timezone {
</del><ins>+struct sk_timezone {
</ins><span class="cx"> int tz_minuteswest; /* minutes W of Greenwich */
</span><span class="cx"> int tz_dsttime; /* type of dst correction */
</span><span class="cx"> };
</span><del>-int gettimeofday(struct timeval *tv, struct timezone *tz)
</del><ins>+int gettimeofday(struct timeval *tv, struct sk_timezone *tz)
</ins><span class="cx"> {
</span><span class="cx"> FILETIME ft;
</span><span class="cx"> unsigned __int64 tmpres = 0;
</span><span class="lines">@@ -882,6 +882,8 @@
</span><span class="cx"> int res;
</span><span class="cx"> int forever = 1;
</span><span class="cx">
</span><ins>+ if (!tech_pvt) return NULL;
+
</ins><span class="cx"> DEBUGA_SKYPE("In skypiax_signaling_thread_func: started, p=%p\n", SKYPIAX_P_LOG,
</span><span class="cx"> (void *) tech_pvt);
</span><span class="cx">
</span><span class="lines">@@ -1695,7 +1697,7 @@
</span><span class="cx"> argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!argc) {
</del><ins>+ if (!argc || !argv[0]) {
</ins><span class="cx"> stream->write_function(stream, "%s", SK_SYNTAX);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -1885,7 +1887,7 @@
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("NOT FOUND\n", SKYPIAX_P_LOG);
</span><span class="cx">
</span><del>- if (!strlen(tech_pvt->skype_call_id)) {
</del><ins>+ if (tech_pvt && tech_pvt->skype_call_id && !strlen(tech_pvt->skype_call_id)) {
</ins><span class="cx"> /* we are not inside an active call */
</span><span class="cx">
</span><span class="cx"> sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id);
</span><span class="lines">@@ -1905,12 +1907,13 @@
</span><span class="cx"> ("NEW! name: %s, state: %d, value=%s, tech_pvt->callid_number=%s, tech_pvt->skype_user=%s\n",
</span><span class="cx"> SKYPIAX_P_LOG, tech_pvt->name, tech_pvt->interface_state, value,
</span><span class="cx"> tech_pvt->callid_number, tech_pvt->skype_user);
</span><del>- switch_mutex_unlock(globals.mutex);
</del><ins>+ } else if (!tech_pvt || !tech_pvt->skype_call_id) {
+ ERRORA("No Call ID?\n", SKYPIAX_P_LOG);
</ins><span class="cx"> } else {
</span><del>-
</del><span class="cx"> ERRORA("We're in a call now %s\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id);
</span><del>- switch_mutex_unlock(globals.mutex);
</del><span class="cx"> }
</span><ins>+
+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> int skypiax_transfer(private_t * tech_pvt, char *id, char *value)
</span><span class="lines">@@ -1948,9 +1951,9 @@
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("NOT FOUND\n", SKYPIAX_P_LOG);
</span><span class="cx">
</span><del>- if (!strlen(tech_pvt->skype_call_id)) {
</del><ins>+ if (!tech_pvt || !tech_pvt->skype_call_id || !strlen(tech_pvt->skype_call_id)) {
</ins><span class="cx"> /* we are not inside an active call */
</span><del>- ERRORA("We're NO MORE in a call now %s\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id);
</del><ins>+ ERRORA("We're NO MORE in a call now %s\n", SKYPIAX_P_LOG, (tech_pvt && tech_pvt->skype_call_id) ? tech_pvt->skype_call_id : "" );
</ins><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx">
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>