[libgsf] openpkg: fuzzed file fix

[Morten Welinder <mortenw src gnome org>]

commit 284c420878430842303bf5c19786c6499869a8fc
Author: Morten Welinder <terra gnome org>
Date:   Sun May 10 16:58:14 2015 -0400

    openpkg: fuzzed file fix

 ChangeLog                |    5 +++++
 NEWS                     |    2 +-
 gsf/gsf-open-pkg-utils.c |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e657b54..c5bc0df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-10  Morten Welinder  <terra gnome org>
+
+       * gsf/gsf-open-pkg-utils.c (open_pkg_rel_begin): Be more careful
+       in removing entries partially overwritten by dupes.  [#749183]
+
 2015-05-09  Morten Welinder  <terra gnome org>
 
        * gsf/gsf-infile-msvba.c (vba_dir_read): Free only once.
diff --git a/NEWS b/NEWS
index 7e4ef03..ea7cb8f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ libgsf 1.14.34
 
 Morten:
        * Fix OLE2 property parsing problem.  [#748528]
-       * Fuzzed file fixes.  [#749120] [#749169]
+       * Fuzzed file fixes.  [#749120] [#749169] [#749183]
 
 --------------------------------------------------------------------------
 libgsf 1.14.33
diff --git a/gsf/gsf-open-pkg-utils.c b/gsf/gsf-open-pkg-utils.c
index 56f0323..c0fbcd5 100644
--- a/gsf/gsf-open-pkg-utils.c
+++ b/gsf/gsf-open-pkg-utils.c
@@ -107,7 +107,7 @@ open_pkg_rel_begin (GsfXMLIn *xin, xmlChar const **attrs)
        rel->is_extern  = is_extern;
 
        /* Make sure we don't point to a freed rel in the type hash.  */
-       orel = g_hash_table_lookup (rels->by_type, type);
+       orel = g_hash_table_lookup (rels->by_id, id);
        if (orel)
                g_hash_table_remove (rels->by_type, orel->type);
        g_hash_table_replace (rels->by_type, rel->type, rel);