diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:52 +0000 |
| commit | 0f157e7d6c4be48f213ea022cb2d6d1316c423c8 (patch) | |
| tree | ff4ad271b50a39e23d5a50a54f4bff37342cdc1c /wsutil | |
| parent | Adding debian version 4.2.4-1. (diff) | |
| download | wireshark-0f157e7d6c4be48f213ea022cb2d6d1316c423c8.tar.xz wireshark-0f157e7d6c4be48f213ea022cb2d6d1316c423c8.zip | |
Merging upstream version 4.2.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/cpu_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c index f9e6aa25..8b06b070 100644 --- a/wsutil/cpu_info.c +++ b/wsutil/cpu_info.c @@ -201,7 +201,7 @@ get_cpu_info(GString *str) /* * Allocate a buffer for the subkey. */ - subkey_buf = (wchar_t *)g_malloc(max_subkey_len * sizeof (wchar_t)); + subkey_buf = g_new(wchar_t, max_subkey_len); if (subkey_buf == NULL) { /* Just give up. */ g_tree_destroy(model_names); @@ -383,6 +383,7 @@ get_cpu_info(GString *str) */ uint32_t CPUInfo[4]; char CPUBrandString[0x40]; + char *model_name; unsigned nExIds; /* |