1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
--- a/examples/board_simduino/simduino.c
+++ b/examples/board_simduino/simduino.c
@@ -104,7 +104,7 @@
for (int i = 1; i < argc; i++) {
if (!strcmp(argv[i] + strlen(argv[i]) - 4, ".hex"))
- strncpy(boot_path, argv[i], sizeof(boot_path));
+ snprintf(boot_path, sizeof(boot_path), "%s", argv[i]);
else if (!strcmp(argv[i], "-d"))
debug++;
else if (!strcmp(argv[i], "-v"))
--- a/simavr/sim/run_avr.c
+++ b/simavr/sim/run_avr.c
@@ -106,7 +106,7 @@
display_usage(basename(argv[0]));
} else if (!strcmp(argv[pi], "-m") || !strcmp(argv[pi], "--mcu")) {
if (pi < argc-1)
- strncpy(name, argv[++pi], sizeof(name));
+ snprintf(name, sizeof(name), "%s", argv[++pi]);
else
display_usage(basename(argv[0]));
} else if (!strcmp(argv[pi], "-f") || !strcmp(argv[pi], "--freq")) {
--- a/simavr/sim/sim_elf.c
+++ b/simavr/sim/sim_elf.c
@@ -250,8 +250,8 @@
firmware->trace[firmware->tracecount].kind = tag;
firmware->trace[firmware->tracecount].mask = mask;
firmware->trace[firmware->tracecount].addr = addr;
- strncpy(firmware->trace[firmware->tracecount].name, name,
- sizeof(firmware->trace[firmware->tracecount].name));
+ snprintf(firmware->trace[firmware->tracecount].name,
+ sizeof(firmware->trace[firmware->tracecount].name), "%s", name);
firmware->tracecount++;
} break;
case AVR_MMCU_TAG_VCD_FILENAME: {
--- a/simavr/sim/sim_vcd_file.c
+++ b/simavr/sim/sim_vcd_file.c
@@ -281,8 +281,8 @@
vcd->signal[vcd->signal_count].alias = v->argv[3][0];
vcd->signal[vcd->signal_count].size = atoi(v->argv[2]);
- strncpy(vcd->signal[vcd->signal_count].name, name,
- sizeof(vcd->signal[0].name));
+ snprintf(vcd->signal[vcd->signal_count].name,
+ sizeof(vcd->signal[0].name), "%s", name);
vcd->signal_count++;
}
@@ -482,7 +482,7 @@
return -1;
int index = vcd->signal_count++;
avr_vcd_signal_t * s = &vcd->signal[index];
- strncpy(s->name, name, sizeof(s->name));
+ snprintf(s->name, sizeof(s->name), "%s", name);
s->size = signal_bit_size;
s->alias = ' ' + vcd->signal_count ;
|
