mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 20:20:35 +00:00
Fix defects detected by coverity scan
This commit is contained in:
parent
efc6082722
commit
2253b29bf1
@ -104,10 +104,10 @@ serial_t *openserial(const char *path, int mode, char *msg)
|
|||||||
strncpy(port, path, p-path); port[p-path] = '\0';
|
strncpy(port, path, p-path); port[p-path] = '\0';
|
||||||
sscanf(p, ":%d:%d:%c:%d:%s", &brate, &bsize, &parity, &stopb, fctr);
|
sscanf(p, ":%d:%d:%c:%d:%s", &brate, &bsize, &parity, &stopb, fctr);
|
||||||
}
|
}
|
||||||
else strcpy(port, path);
|
else if(strlen(path) < 128) strcpy(port, path);
|
||||||
|
|
||||||
for (i = 0;i < 11;i++) if (br[i] == brate) break;
|
for (i = 0;i < 10; i++) if (br[i] == brate) break;
|
||||||
if (i >= 12)
|
if (i >= 11)
|
||||||
{
|
{
|
||||||
sprintf(msg, "bitrate error (%d)", brate);
|
sprintf(msg, "bitrate error (%d)", brate);
|
||||||
tracet(1, "openserial: %s path=%s\n", msg, path);
|
tracet(1, "openserial: %s path=%s\n", msg, path);
|
||||||
@ -150,8 +150,8 @@ serial_t *openserial(const char *path, int mode, char *msg)
|
|||||||
/* close serial --------------------------------------------------------------*/
|
/* close serial --------------------------------------------------------------*/
|
||||||
void closeserial(serial_t *serial)
|
void closeserial(serial_t *serial)
|
||||||
{
|
{
|
||||||
tracet(3, "closeserial: dev=%d\n", serial->dev);
|
|
||||||
if (!serial) return;
|
if (!serial) return;
|
||||||
|
tracet(3, "closeserial: dev=%d\n", serial->dev);
|
||||||
close(serial->dev);
|
close(serial->dev);
|
||||||
free(serial);
|
free(serial);
|
||||||
}
|
}
|
||||||
@ -161,8 +161,8 @@ void closeserial(serial_t *serial)
|
|||||||
int readserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribute__((unused)))
|
int readserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribute__((unused)))
|
||||||
{
|
{
|
||||||
int nr;
|
int nr;
|
||||||
tracet(4, "readserial: dev=%d n=%d\n", serial->dev, n);
|
|
||||||
if (!serial) return 0;
|
if (!serial) return 0;
|
||||||
|
tracet(4, "readserial: dev=%d n=%d\n", serial->dev, n);
|
||||||
if ((nr = read(serial->dev, buff, n)) < 0) return 0;
|
if ((nr = read(serial->dev, buff, n)) < 0) return 0;
|
||||||
tracet(5, "readserial: exit dev=%d nr=%d\n", serial->dev, nr);
|
tracet(5, "readserial: exit dev=%d nr=%d\n", serial->dev, nr);
|
||||||
return nr;
|
return nr;
|
||||||
@ -173,8 +173,8 @@ int readserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribu
|
|||||||
int writeserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribute__((unused)))
|
int writeserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribute__((unused)))
|
||||||
{
|
{
|
||||||
int ns;
|
int ns;
|
||||||
tracet(3, "writeserial: dev=%d n=%d\n", serial->dev, n);
|
|
||||||
if (!serial) return 0;
|
if (!serial) return 0;
|
||||||
|
tracet(3, "writeserial: dev=%d n=%d\n", serial->dev, n);
|
||||||
if ((ns = write(serial->dev, buff, n)) < 0) return 0;
|
if ((ns = write(serial->dev, buff, n)) < 0) return 0;
|
||||||
tracet(5, "writeserial: exit dev=%d ns=%d\n", serial->dev, ns);
|
tracet(5, "writeserial: exit dev=%d ns=%d\n", serial->dev, ns);
|
||||||
return ns;
|
return ns;
|
||||||
@ -269,7 +269,7 @@ int openfile_(file_t *file, gtime_t time, char *msg)
|
|||||||
if ((fp = fopen(tagpath, "rb")))
|
if ((fp = fopen(tagpath, "rb")))
|
||||||
{
|
{
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
remove(tagpath);
|
if (remove(tagpath) != 0) trace(1, "Error removing file");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
@ -315,7 +315,7 @@ file_t *openfile(const char *path, int mode, char *msg)
|
|||||||
if (!(file = (file_t *)malloc(sizeof(file_t)))) return NULL;
|
if (!(file = (file_t *)malloc(sizeof(file_t)))) return NULL;
|
||||||
|
|
||||||
file->fp = file->fp_tag = file->fp_tmp = file->fp_tag_tmp = NULL;
|
file->fp = file->fp_tag = file->fp_tmp = file->fp_tag_tmp = NULL;
|
||||||
strcpy(file->path, path);
|
if(strlen(path) < MAXSTRPATH) strcpy(file->path, path);
|
||||||
if ((p = strstr(file->path, "::"))) *p = '\0';
|
if ((p = strstr(file->path, "::"))) *p = '\0';
|
||||||
file->openpath[0] = '\0';
|
file->openpath[0] = '\0';
|
||||||
file->mode = mode;
|
file->mode = mode;
|
||||||
@ -344,8 +344,8 @@ file_t *openfile(const char *path, int mode, char *msg)
|
|||||||
/* close file ----------------------------------------------------------------*/
|
/* close file ----------------------------------------------------------------*/
|
||||||
void closefile(file_t *file)
|
void closefile(file_t *file)
|
||||||
{
|
{
|
||||||
tracet(3, "closefile: fp=%d\n", file->fp);
|
|
||||||
if (!file) return;
|
if (!file) return;
|
||||||
|
tracet(3, "closefile: fp=%d\n", file->fp);
|
||||||
closefile_(file);
|
closefile_(file);
|
||||||
free(file);
|
free(file);
|
||||||
}
|
}
|
||||||
@ -404,9 +404,8 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
|
|||||||
int nr = 0;
|
int nr = 0;
|
||||||
size_t fpos;
|
size_t fpos;
|
||||||
|
|
||||||
tracet(4, "readfile: fp=%d nmax=%d\n", file->fp, nmax);
|
|
||||||
|
|
||||||
if (!file) return 0;
|
if (!file) return 0;
|
||||||
|
tracet(4, "readfile: fp=%d nmax=%d\n", file->fp, nmax);
|
||||||
|
|
||||||
if (file->fp == stdin)
|
if (file->fp == stdin)
|
||||||
{
|
{
|
||||||
@ -431,7 +430,7 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
|
|||||||
if (fread(&tick, sizeof(tick), 1, file->fp_tag) < 1 ||
|
if (fread(&tick, sizeof(tick), 1, file->fp_tag) < 1 ||
|
||||||
fread(&fpos, sizeof(fpos), 1, file->fp_tag) < 1)
|
fread(&fpos, sizeof(fpos), 1, file->fp_tag) < 1)
|
||||||
{
|
{
|
||||||
fseek(file->fp, 0, SEEK_END);
|
if(fseek(file->fp, 0, SEEK_END) != 0) trace(1, "fseek error");
|
||||||
sprintf(msg, "end");
|
sprintf(msg, "end");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -445,7 +444,7 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
|
|||||||
|
|
||||||
if ((int)(fpos-file->fpos) >= nmax)
|
if ((int)(fpos-file->fpos) >= nmax)
|
||||||
{
|
{
|
||||||
fseek(file->fp, fpos, SEEK_SET);
|
if(fseek(file->fp, fpos, SEEK_SET) != 0) trace(1, "Error fseek");
|
||||||
file->fpos = fpos;
|
file->fpos = fpos;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -453,7 +452,7 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
|
|||||||
|
|
||||||
if (file->repmode || file->speed>0.0)
|
if (file->repmode || file->speed>0.0)
|
||||||
{
|
{
|
||||||
fseek(file->fp_tag, -(long)(sizeof(tick)+sizeof(fpos)), SEEK_CUR);
|
if(fseek(file->fp_tag, -(long)(sizeof(tick)+sizeof(fpos)), SEEK_CUR) !=0) trace(1, "Error fseek");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -478,9 +477,8 @@ int writefile(file_t *file, unsigned char *buff, int n, char *msg)
|
|||||||
double tow1, tow2, intv;
|
double tow1, tow2, intv;
|
||||||
size_t fpos, fpos_tmp;
|
size_t fpos, fpos_tmp;
|
||||||
|
|
||||||
tracet(3, "writefile: fp=%d n=%d\n", file->fp, n);
|
|
||||||
|
|
||||||
if (!file) return 0;
|
if (!file) return 0;
|
||||||
|
tracet(3, "writefile: fp=%d n=%d\n", file->fp, n);
|
||||||
|
|
||||||
wtime = utc2gpst(timeget()); /* write time in gpst */
|
wtime = utc2gpst(timeget()); /* write time in gpst */
|
||||||
|
|
||||||
@ -560,7 +558,7 @@ void decodetcppath(const char *path, char *addr, char *port, char *user,
|
|||||||
if (mntpnt) *mntpnt = '\0';
|
if (mntpnt) *mntpnt = '\0';
|
||||||
if (str) *str = '\0';
|
if (str) *str = '\0';
|
||||||
|
|
||||||
strcpy(buff, path);
|
if(strlen(path) < MAXSTRPATH) strcpy(buff, path);
|
||||||
|
|
||||||
if (!(p = strrchr(buff, '@'))) p = buff;
|
if (!(p = strrchr(buff, '@'))) p = buff;
|
||||||
|
|
||||||
@ -645,7 +643,7 @@ int connect_nb(socket_t sock, struct sockaddr *addr, socklen_t len)
|
|||||||
int err, flag;
|
int err, flag;
|
||||||
|
|
||||||
flag = fcntl(sock, F_GETFL, 0);
|
flag = fcntl(sock, F_GETFL, 0);
|
||||||
fcntl(sock, F_SETFL, flag|O_NONBLOCK);
|
if(fcntl(sock, F_SETFL, flag|O_NONBLOCK) == -1) trace(1, "fcntl error");
|
||||||
if (connect(sock, addr, len) == -1)
|
if (connect(sock, addr, len) == -1)
|
||||||
{
|
{
|
||||||
err = errsock();
|
err = errsock();
|
||||||
@ -761,7 +759,7 @@ tcpsvr_t *opentcpsvr(const char *path, char *msg)
|
|||||||
{
|
{
|
||||||
tcpsvr_t *tcpsvr, tcpsvr0; // = {{0}};
|
tcpsvr_t *tcpsvr, tcpsvr0; // = {{0}};
|
||||||
char port[256] = "";
|
char port[256] = "";
|
||||||
|
tcpsvr0 = { {0, {0}, 0, {0,0,0,{0}},0,0,0,0}, { 0, {0}, 0,{0,0,0,{0}},0,0,0,0} };
|
||||||
tracet(3, "opentcpsvr: path=%s\n", path);
|
tracet(3, "opentcpsvr: path=%s\n", path);
|
||||||
|
|
||||||
if (!(tcpsvr = (tcpsvr_t *)malloc(sizeof(tcpsvr_t)))) return NULL;
|
if (!(tcpsvr = (tcpsvr_t *)malloc(sizeof(tcpsvr_t)))) return NULL;
|
||||||
@ -985,6 +983,7 @@ tcpcli_t *opentcpcli(const char *path, char *msg)
|
|||||||
{
|
{
|
||||||
tcpcli_t *tcpcli, tcpcli0; // = {{0}};
|
tcpcli_t *tcpcli, tcpcli0; // = {{0}};
|
||||||
char port[256] = "";
|
char port[256] = "";
|
||||||
|
tcpcli0 = {{0, {0}, 0, {0,0,0,{0}},0,0,0,0}, 0, 0};
|
||||||
|
|
||||||
tracet(3, "opentcpcli: path=%s\n", path);
|
tracet(3, "opentcpcli: path=%s\n", path);
|
||||||
|
|
||||||
@ -1425,7 +1424,7 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
|
|||||||
topts[2] = 0; /* download time offset (s) */
|
topts[2] = 0; /* download time offset (s) */
|
||||||
topts[3] = 0; /* retry interval (s) (0: no retry) */
|
topts[3] = 0; /* retry interval (s) (0: no retry) */
|
||||||
}
|
}
|
||||||
strcpy(buff, path);
|
if(strlen(path) < MAXSTRPATH) strcpy(buff, path);
|
||||||
|
|
||||||
if ((p = strchr(buff, '/')))
|
if ((p = strchr(buff, '/')))
|
||||||
{
|
{
|
||||||
@ -1550,13 +1549,13 @@ void *ftpthread(void *arg)
|
|||||||
/* execute download command */
|
/* execute download command */
|
||||||
if ((ret = execcmd(cmd)))
|
if ((ret = execcmd(cmd)))
|
||||||
{
|
{
|
||||||
remove(local);
|
if(remove(local) != 0) trace(1, "Error removing file");
|
||||||
tracet(1, "execcmd error: cmd=%s ret=%d\n", cmd, ret);
|
tracet(1, "execcmd error: cmd=%s ret=%d\n", cmd, ret);
|
||||||
ftp->error = ret;
|
ftp->error = ret;
|
||||||
ftp->state = 3;
|
ftp->state = 3;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
remove(errfile);
|
if(remove(errfile) != 0) trace(1, "Error removing file");
|
||||||
|
|
||||||
/* uncompress downloaded file */
|
/* uncompress downloaded file */
|
||||||
if ((p = strrchr(local, '.')) &&
|
if ((p = strrchr(local, '.')) &&
|
||||||
@ -1565,8 +1564,8 @@ void *ftpthread(void *arg)
|
|||||||
{
|
{
|
||||||
if (rtk_uncompress(local, tmpfile))
|
if (rtk_uncompress(local, tmpfile))
|
||||||
{
|
{
|
||||||
remove(local);
|
if(remove(local) != 0) trace(1, "Error removing file");
|
||||||
strcpy(local, tmpfile);
|
if(strlen(tmpfile) < 1024) strcpy(local, tmpfile);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1576,7 +1575,7 @@ void *ftpthread(void *arg)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
strcpy(ftp->local, local);
|
if(strlen(local) < 1024 ) strcpy(ftp->local, local);
|
||||||
ftp->state = 2; /* ftp completed */
|
ftp->state = 2; /* ftp completed */
|
||||||
|
|
||||||
tracet(3, "ftpthread: complete cmd=%s\n", cmd);
|
tracet(3, "ftpthread: complete cmd=%s\n", cmd);
|
||||||
@ -1754,7 +1753,7 @@ int stropen(stream_t *stream, int type, int mode, const char *path)
|
|||||||
|
|
||||||
stream->type = type;
|
stream->type = type;
|
||||||
stream->mode = mode;
|
stream->mode = mode;
|
||||||
strcpy(stream->path, path);
|
if(strlen(path) < MAXSTRPATH ) strcpy(stream->path, path);
|
||||||
stream->inb = stream->inr = stream->outb = stream->outr = 0;
|
stream->inb = stream->inr = stream->outb = stream->outr = 0;
|
||||||
stream->tick = tickget();
|
stream->tick = tickget();
|
||||||
stream->inbt = stream->outbt = 0;
|
stream->inbt = stream->outbt = 0;
|
||||||
@ -2060,7 +2059,7 @@ void strsettimeout(stream_t *stream, int toinact, int tirecon)
|
|||||||
void strsetdir(const char *dir)
|
void strsetdir(const char *dir)
|
||||||
{
|
{
|
||||||
tracet(3, "strsetdir: dir=%s\n", dir);
|
tracet(3, "strsetdir: dir=%s\n", dir);
|
||||||
strcpy(localdir, dir);
|
if (strlen(dir) < 1024) strcpy(localdir, dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -2072,7 +2071,7 @@ void strsetdir(const char *dir)
|
|||||||
void strsetproxy(const char *addr)
|
void strsetproxy(const char *addr)
|
||||||
{
|
{
|
||||||
tracet(3, "strsetproxy: addr=%s\n", addr);
|
tracet(3, "strsetproxy: addr=%s\n", addr);
|
||||||
strcpy(proxyaddr, addr);
|
if(strlen(addr) < 256) strcpy(proxyaddr, addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user