# HG changeset patch
# User Vadim Lebedev
# Date 1315834592 -7200
# Node ID faee05010bca34be8fc6c810fa79880b2ec7d1b8
# Parent a823790e30a34da806085cd31d69302954ff369b
mediastreamer COVERITY fixes
diff -r a823790e30a3 -r faee05010bca src/ice.c
--- a/src/ice.c Mon Jun 27 01:25:54 2011 +0200
+++ b/src/ice.c Mon Sep 12 15:36:32 2011 +0200
@@ -466,12 +466,14 @@
static void
_ice_createErrorResponse(StunMessage *response, int cl, int number, const char* msg)
{
+ const size_t S = sizeof(response->errorCode.reason);
response->msgHdr.msgType = (STUN_METHOD_BINDING | STUN_ERR_RESP);
response->hasErrorCode = TRUE;
response->errorCode.errorClass = cl;
response->errorCode.number = number;
- strcpy(response->errorCode.reason, msg);
- response->errorCode.sizeReason = strlen(msg);
+ strncpy(response->errorCode.reason, msg, S);
+ response->errorCode.reason[S-1] = 0;
+ response->errorCode.sizeReason = strlen(response->errorCode.reason);
response->hasFingerprint = TRUE;
}
diff -r a823790e30a3 -r faee05010bca src/msconf.c
--- a/src/msconf.c Mon Jun 27 01:25:54 2011 +0200
+++ b/src/msconf.c Mon Sep 12 15:36:32 2011 +0200
@@ -397,8 +397,8 @@
en=chan->energy;
for(j=0;jconf_nsamples;++j){
- float s=chan->input[j];
- en=(s*s*coef) + ((float)1.0-coef)*en;
+ float v=chan->input[j];
+ en=(v*v*coef) + ((float)1.0-coef)*en;
}
chan->energy=en;
vol.energy = chan->energy; //10*log10f(chan->energy/max_e);
diff -r a823790e30a3 -r faee05010bca src/msfileplayer_win.c
--- a/src/msfileplayer_win.c Mon Jun 27 01:25:54 2011 +0200
+++ b/src/msfileplayer_win.c Mon Sep 12 15:36:32 2011 +0200
@@ -16,9 +16,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+#ifndef UNICODE
#define UNICODE
-
+#endif
#include "mediastreamer2/msfileplayer.h"
#include "mediastreamer2/waveheader.h"
#include "mediastreamer2/msticker.h"
@@ -205,83 +205,75 @@
err=0;
res = ReadFile(d->fd, om->b_wptr, bytes, &err, NULL) ;
}
- if (err>=0){
- if (err==bytes){
- om->b_wptr+=err;
- ms_queue_put(f->outputs[0],om);
+ if (err==bytes){
+ om->b_wptr+=err;
+ ms_queue_put(f->outputs[0],om);
+ }
+ else if (err>0){
+ BOOL res;
+
+ om->b_wptr+=err;
+
+ ms_filter_notify_no_arg(f,MS_FILE_PLAYER_EOF);
+ SetFilePointer(d->fd, d->hsize, NULL, FILE_BEGIN);
+ //read_wav_header(d);
+
+ /* special value for playing file only once */
+ if (d->loop_after==-2)
+ {
+ freemsg(om);
+ player_close(f,NULL);
+ return;
}
- else if (err>0){
- BOOL res;
- om->b_wptr+=err;
+ if (d->loop_after>0)
+ {
+ d->stat=-1;
+ d->pause_time=d->loop_after;
+ }
+ else
+ {
+ bytes=bytes-err;
+ err=0;
+ res = ReadFile(d->fd, om->b_wptr, bytes, &err, NULL);
+ if (err>0){
+ om->b_wptr+=err;
+ }
+ }
- ms_filter_notify_no_arg(f,MS_FILE_PLAYER_EOF);
- SetFilePointer(d->fd, d->hsize, NULL, FILE_BEGIN);
- //read_wav_header(d);
+ ms_queue_put(f->outputs[0],om);
+ }
+ else if (err==0){
+ BOOL res;
+ ms_filter_notify_no_arg(f,MS_FILE_PLAYER_EOF);
+ SetFilePointer(d->fd, d->hsize, NULL, FILE_BEGIN);
- /* special value for playing file only once */
- if (d->loop_after==-2)
- {
- freemsg(om);
- player_close(f,NULL);
+ if (d->loop_after==-2)
+ {
+ freemsg(om);
+ player_close(f,NULL);
+ return;
+ }
+
+ if (d->loop_after>0)
+ {
+ d->stat=-1;
+ d->pause_time=d->loop_after;
+ }
+ else
+ {
+ bytes=bytes-err;
+ err=0;
+ res = ReadFile(d->fd, om->b_wptr, bytes, &err, NULL);
+ if (err>0){
+ om->b_wptr+=err;
+ ms_queue_put(f->outputs[0],om);
return;
}
+ }
+ freemsg(om);
- if (d->loop_after>0)
- {
- d->stat=-1;
- d->pause_time=d->loop_after;
- }
- else
- {
- bytes=bytes-err;
- err=0;
- res = ReadFile(d->fd, om->b_wptr, bytes, &err, NULL);
- if (err>0){
- om->b_wptr+=err;
- }
- }
-
- ms_queue_put(f->outputs[0],om);
- }
- else if (err==0){
- BOOL res;
- ms_filter_notify_no_arg(f,MS_FILE_PLAYER_EOF);
- SetFilePointer(d->fd, d->hsize, NULL, FILE_BEGIN);
-
- if (d->loop_after==-2)
- {
- freemsg(om);
- player_close(f,NULL);
- return;
- }
-
- if (d->loop_after>0)
- {
- d->stat=-1;
- d->pause_time=d->loop_after;
- }
- else
- {
- bytes=bytes-err;
- err=0;
- res = ReadFile(d->fd, om->b_wptr, bytes, &err, NULL);
- if (err>0){
- om->b_wptr+=err;
- ms_queue_put(f->outputs[0],om);
- return;
- }
- }
- freemsg(om);
-
- }else freemsg(om);
- }else{
-#if !defined(_WIN32_WCE)
- ms_warning("Fail to read %i bytes: %s",bytes,strerror(errno));
-#else
- ms_warning("Fail to read %i bytes: %i",bytes,WSAGetLastError());
-#endif
- }
+ }else freemsg(om);
}
}
diff -r a823790e30a3 -r faee05010bca src/msfilerec_win.c
--- a/src/msfilerec_win.c Mon Jun 27 01:25:54 2011 +0200
+++ b/src/msfilerec_win.c Mon Sep 12 15:36:32 2011 +0200
@@ -16,9 +16,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+#ifndef UNICODE
#define UNICODE
-
+#endif
#include "mediastreamer2/msfilerec.h"
#include "mediastreamer2/waveheader.h"