From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/13] installer: Replace all uses of strncpy with snprintf Date: Fri, 05 Apr 2024 12:59:39 +0000 Message-ID: <20240405125942.1803058-10-michael.tremer@ipfire.org> In-Reply-To: <20240405125942.1803058-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8109249183574490120==" List-Id: --===============8109249183574490120== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- src/installer/hw.c | 8 ++++---- src/installer/main.c | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 809a448a0..6bf05b185 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -324,6 +324,7 @@ static unsigned long long hw_block_device_get_size(const = char* dev) { struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) { struct hw_disk** ret =3D hw_create_disks(); struct hw_disk** disks =3D ret; + char size_str[32]; =20 // Determine the disk device of source if it is a partition const char* sourcedisk =3D NULL; @@ -388,7 +389,7 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char*= sourcedrive) { =20 disk->ref =3D 1; =20 - strncpy(disk->path, dev_path, sizeof(disk->path)); + snprintf(disk->path, sizeof(disk->path), "%s", dev_path); const char* p =3D disk->path + 5; =20 disk->size =3D size; @@ -401,7 +402,7 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char*= sourcedrive) { vendor =3D udev_device_get_sysattr_value(dev, "manufacturer"); =20 if (vendor) - strncpy(disk->vendor, vendor, sizeof(disk->vendor)); + snprintf(disk->vendor, sizeof(disk->vendor), "%s", vendor); else *disk->vendor =3D '\0'; =20 @@ -413,12 +414,11 @@ struct hw_disk** hw_find_disks(struct hw* hw, const cha= r* sourcedrive) { model =3D udev_device_get_sysattr_value(dev, "product"); =20 if (model) - strncpy(disk->model, model, sizeof(disk->model)); + snprintf(disk->model, sizeof(disk->model), "%s", model); else *disk->model =3D '\0'; =20 // Format description - char size_str[STRING_SIZE]; snprintf(size_str, sizeof(size_str), "%4.1fGB", (double)disk->size / pow(1= 024, 3)); =20 if (*disk->vendor && *disk->model) { diff --git a/src/installer/main.c b/src/installer/main.c index 20a8cc962..ecfcff2ec 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -310,7 +310,8 @@ static void parse_command_line(FILE* flog, struct config*= c) { =20 char* token =3D strtok(cmdline, " "); while (token) { - strncpy(buffer, token, sizeof(buffer)); + snprintf(buffer, sizeof(buffer), "%s", token); + char* val =3D buffer; char* key =3D strsep(&val, "=3D"); =20 @@ -336,7 +337,7 @@ static void parse_command_line(FILE* flog, struct config*= c) { =20 // download url else if (strcmp(key, "installer.download-url") =3D=3D 0) { - strncpy(c->download_url, val, sizeof(c->download_url)); + snprintf(c->download_url, sizeof(c->download_url), "%s", val); c->perform_download =3D 1; =20 // Require networking for the download @@ -344,7 +345,7 @@ static void parse_command_line(FILE* flog, struct config*= c) { =20 // postinstall script } else if (strcmp(key, "installer.postinstall") =3D=3D 0) { - strncpy(c->postinstall, val, sizeof(c->postinstall)); + snprintf(c->postinstall, sizeof(c->postinstall), "%s", val); =20 // Require networking for the download c->require_networking =3D 1; --=20 2.39.2 --===============8109249183574490120==--