X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=compat%2Flib%2Fbylabel.c;h=7f710ed7655e7196cef4a528cb5c92a242dc48e9;hp=07f0dd92320ccb112b773a9eb54e44b1a826256c;hb=cdef84caee08a2436de99fc3e6f5d8eeb3635072;hpb=7af4fa89be1fb5dfae84ff45b96c2f9bd521d135 diff --git a/compat/lib/bylabel.c b/compat/lib/bylabel.c index 07f0dd9..7f710ed 100644 --- a/compat/lib/bylabel.c +++ b/compat/lib/bylabel.c @@ -29,12 +29,14 @@ #define EXT2_SUPER_SIZE sizeof(struct ext2_super_block) #define EXT2_SUPER_MAGIC 0xEF53 +#define VOLNAMSZ 16 + struct ext2_super_block { unsigned char s_dummy1[56]; unsigned char s_magic[2]; unsigned char s_dummy2[46]; unsigned char s_uuid[16]; - unsigned char s_volume_name[16]; + unsigned char s_volume_name[VOLNAMSZ]; }; #define ext2magic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) @@ -71,7 +73,9 @@ get_label_uuid(const char *device, char **label, char *uuid) { /* superblock is ext2 - now what is its label? */ memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid)); - *label = strdup(e2sb.s_volume_name); + *label = malloc(VOLNAMSZ + 1); + strncpy(*label, e2sb.s_volume_name, VOLNAMSZ); + (*label)[VOLNAMSZ] = 0; return 0; }