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

Allow for NULL preference descriptions. 

svn path=/trunk/; revision=35242
This commit is contained in:
Jaap Keuter 2010-12-22 06:25:33 +00:00
parent d1787cafa4
commit fc4d25fcc4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/README.developer
View File

@ -3563,7 +3563,7 @@ Where: module - Returned by the prefs_register_protocol routine
the preference file will already have it
title - Field title in the preferences dialog
description - Comments added to the preference file above the
preference value
preference value and shown as tooltip in the GUI, or NULL
var - pointer to the storage location that is updated when the
field is changed in the preference dialog box. Note that
with string preferences the given pointer is overwritten

3
epan/prefs.c
View File

@ -2763,7 +2763,8 @@ write_pref(gpointer data, gpointer user_data)
* Make multiple line descriptions appear as
* multiple commented lines in prefs file.
*/
if (g_ascii_strncasecmp(pref->description,"", 2) != 0) {
if (pref->description &&
(g_ascii_strncasecmp(pref->description,"", 2) != 0)) {
desc_lines = g_strsplit(pref->description,"\n",0);
for (i = 0; desc_lines[i] != NULL; ++i) {
fprintf(arg->pf, "\n# %s", desc_lines[i]);