projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29babb9
)
move the g_free() from the last commit down
author
Ryan Lortie
<desrt@desrt.ca>
Sat, 10 Jul 2010 21:45:51 +0000
(17:45 -0400)
committer
Ryan Lortie
<desrt@desrt.ca>
Sat, 10 Jul 2010 23:15:59 +0000
(19:15 -0400)
It is needed for the error message...
glib/gvariant-parser.c
patch
|
blob
|
history
diff --git
a/glib/gvariant-parser.c
b/glib/gvariant-parser.c
index
d02775a
..
3379c4c
100644
(file)
--- a/
glib/gvariant-parser.c
+++ b/
glib/gvariant-parser.c
@@
-630,7
+630,6
@@
ast_array_get_pattern (AST **array,
merged = pattern_coalesce (pattern, tmp);
g_free (pattern);
pattern = merged;
- g_free (tmp);
if (merged == NULL)
/* set coalescence implies pairwise coalescence (i think).
@@
-669,7
+668,10
@@
ast_array_get_pattern (AST **array,
j++;
}
+
}
+
+ g_free (tmp);
}
return pattern;