osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wsutil: Strip the processor brand string. 

The processor brand string returned by CPUID is left-padded in some
cases. For example, adding

g_warning("==>%s<==\n", CPUBrandString);

to get_cpu_info() on a test machine here returns

** (tshark.exe:3808): WARNING **: ==>       Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz<==

Make sure it's stripped before we add it to our version information.

Change-Id: Idf9f9574477043a5e7fe4ff1ecb7890d6da90e0a
Reviewed-on: https://code.wireshark.org/review/36108
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2020-02-14 12:34:23 -08:00 committed by Anders Broman
parent 273ec3ffef
commit 7247b98d45
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wsutil/cpu_info.c
View File

@ -51,7 +51,7 @@ get_cpu_info(GString *str)
if (str->len > 0)
g_string_append(str, ", with ");
g_string_append_printf(str, "%s", CPUBrandString);
g_string_append_printf(str, "%s", g_strstrip(CPUBrandString));
if (ws_cpuid_sse42())
g_string_append(str, " (with SSE4.2)");