luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk:

Browse Source 
2007-04-25  Michael Natterer  <mitch@imendio.com>

	Merge from trunk:

	* gparamspecs.c (param_string_validate): also clear the
	NOCOPY_CONTENTS flag when replacing NULL with the empty string.


svn path=/branches/glib-2-12/; revision=5459
This commit is contained in:
Michael Natterer 2007-04-25 08:57:34 +00:00 committed by Michael Natterer
parent 0c2ffdd3c5
commit 7c5686caba
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,10 +2,6 @@
Merge from trunk:
* gobject/gparamspecs.c (param_string_validate): don't free or
modify static strings, dup them when needed and clear the
G_VALUE_NOCOPY_CONTENTS flag. Fixes bug #432895.
* tests/gobject/paramspec-test.c: test all GParamSpecString
validations with static and allocated strings.

15
gobject/ChangeLog
View File

@ -1,3 +1,18 @@
2007-04-25 Michael Natterer <mitch@imendio.com>
Merge from trunk:
* gparamspecs.c (param_string_validate): also clear the
NOCOPY_CONTENTS flag when replacing NULL with the empty string.
2007-04-24 Michael Natterer <mitch@imendio.com>
Merge from trunk:
* gparamspecs.c (param_string_validate): don't free or modify
static strings, dup them when needed and clear the
G_VALUE_NOCOPY_CONTENTS flag. Fixes bug #432895.
2007-03-08 Matthias Clasen <mclasen@redhat.com>
* === Released 2.12.11 ===

3
gobject/gparamspecs.c
View File

@ -665,11 +665,12 @@ param_string_validate (GParamSpec *pspec,
}
if (sspec->ensure_non_null && !string)
{
value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
value->data[0].v_pointer = g_strdup ("");
changed++;
string = value->data[0].v_pointer;
}
return changed;
}