Skip to content

F
FMC DEL 1ns 4cha
Commit 440342bc authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

lib: fixed integer arithmetic overflow, zeroed unused fields returned by fdelay_get_config_pulse()

parent 5d307f93
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
lib/fdelay-init.c
View file @ 440342bc
...@@ -190,7 +190,7 @@ int fdelay_close(struct fdelay_board *userb) ...@@ -190,7 +190,7 @@ int fdelay_close(struct fdelay_board *userb)
int j; int j;
if (fdelay_is_verbose()) if (fdelay_is_verbose())
fprintf(stderr, "called: %s(index %i, dev_id 0x%x);\n", fprintf(stderr, "called: %s(index %li, dev_id 0x%x);\n",
__func__, b - fd_boards, b->dev_id); __func__, b - fd_boards, b->dev_id);
for (j = 0; j < ARRAY_SIZE(b->fdc); j++) { for (j = 0; j < ARRAY_SIZE(b->fdc); j++) {
if (b->fdc[j] >= 0) if (b->fdc[j] >= 0)
......
lib/fdelay-output.c
View file @ 440342bc
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h>
#include <sys/select.h> #include <sys/select.h>
#include <linux/zio.h> #include <linux/zio.h>
...@@ -40,7 +41,7 @@ void fdelay_time_to_pico(struct fdelay_time *time, uint64_t *pico) ...@@ -40,7 +41,7 @@ void fdelay_time_to_pico(struct fdelay_time *time, uint64_t *pico)
uint64_t p; uint64_t p;
p = time->frac * 8000 / 4096; p = time->frac * 8000 / 4096;
p += time->coarse * 8000; p += (uint64_t) time->coarse * 8000LL;
p += time->utc * (1000ULL * 1000ULL * 1000ULL * 1000ULL); p += time->utc * (1000ULL * 1000ULL * 1000ULL * 1000ULL);
*pico = p; *pico = p;
} }
...@@ -189,6 +190,8 @@ int fdelay_get_config_pulse(struct fdelay_board *userb, ...@@ -189,6 +190,8 @@ int fdelay_get_config_pulse(struct fdelay_board *userb,
uint32_t utc_h, utc_l, tmp; uint32_t utc_h, utc_l, tmp;
uint32_t input_offset, output_offset, output_user_offset; uint32_t input_offset, output_offset, output_user_offset;
memset(pulse, 0, sizeof(struct fdelay_pulse));
sprintf(s,"fd-ch%i/%s", channel + 1, "mode"); sprintf(s,"fd-ch%i/%s", channel + 1, "mode");
if (fdelay_sysfs_get(b, s, &tmp) < 0) if (fdelay_sysfs_get(b, s, &tmp) < 0)
return -1; /* errno already set */ return -1; /* errno already set */
...@@ -293,6 +296,8 @@ int fdelay_get_config_pulse_ps(struct fdelay_board *userb, ...@@ -293,6 +296,8 @@ int fdelay_get_config_pulse_ps(struct fdelay_board *userb,
if (fdelay_get_config_pulse(userb, channel, &pulse) < 0) if (fdelay_get_config_pulse(userb, channel, &pulse) < 0)
return -1; return -1;
memset(ps, 0, sizeof(struct fdelay_pulse_ps));
ps->mode = pulse.mode; ps->mode = pulse.mode;
ps->rep = pulse.rep; ps->rep = pulse.rep;
ps->start = pulse.start; ps->start = pulse.start;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment