tccmacho: avoid warnings with strncpy and always terminate the target string

Detlef Riekenberg committed 4 years ago

Commit 1cd79981 parent 02411201 file · +4 −2Browse files

Unified · Split

 static struct segment_command_64 * add_segment(struct macho *mo, const char *name)
 {
     struct segment_command_64 *sc = add_lc(mo, LC_SEGMENT_64, sizeof(*sc));
-    strncpy(sc->segname, name, 16);
+    strncpy(sc->segname, name, 16-1);
+    sc->segname[16-1] = '\0';
     mo->seg2lc[mo->nseg++] = mo->nlc - 1;
     return sc;
 }
     seg = tcc_realloc(seg, sizeof(*seg) + seg->nsects * sizeof(*sec));
     sec = (struct section_64*)((char*)seg + sizeof(*seg)) + ret;
     memset(sec, 0, sizeof(*sec));
-    strncpy(sec->sectname, name, 16);
+    strncpy(sec->sectname, name, 16-1);
+    sec->sectname[16-1] = '\0';
     strncpy(sec->segname, seg->segname, 16);
     *_seg = seg;
     return ret;

Keyboard shortcuts