From: Zoltan Varga <vargaz@gmail.com>
Date: Wed, 1 Feb 2017 10:37:17 +0000 (-0500)
Subject: [ppdb] Fix support for embedded ppdb data.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=faa79548493f167ea2259f61b90bf16408dbe86e;p=mono.git

[ppdb] Fix support for embedded ppdb data.
---

diff --git a/mono/metadata/debug-mono-ppdb.c b/mono/metadata/debug-mono-ppdb.c
index 581f364423a..b96edfdf697 100644
--- a/mono/metadata/debug-mono-ppdb.c
+++ b/mono/metadata/debug-mono-ppdb.c
@@ -96,6 +96,18 @@ doc_free (gpointer key)
 	g_free (info);
 }
 
+static MonoPPDBFile*
+create_ppdb_file (MonoImage *ppdb_image)
+{
+	MonoPPDBFile *ppdb;
+
+	ppdb = g_new0 (MonoPPDBFile, 1);
+	ppdb->image = ppdb_image;
+	ppdb->doc_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) doc_free);
+	ppdb->method_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_free);
+	return ppdb;
+}
+
 MonoPPDBFile*
 mono_ppdb_load_file (MonoImage *image, const guint8 *raw_contents, int size)
 {
@@ -106,7 +118,12 @@ mono_ppdb_load_file (MonoImage *image, const guint8 *raw_contents, int size)
 	guint8 pe_guid [16];
 	gint32 pe_age;
 	gint32 pe_timestamp;
-	MonoPPDBFile *ppdb;
+
+	if (image->tables [MONO_TABLE_DOCUMENT].rows) {
+		/* Embedded ppdb */
+		mono_image_addref (image);
+		return create_ppdb_file (image);
+	}
 
 	if (!get_pe_debug_guid (image, pe_guid, &pe_age, &pe_timestamp))
 		return NULL;
@@ -150,12 +167,7 @@ mono_ppdb_load_file (MonoImage *image, const guint8 *raw_contents, int size)
 		return NULL;
 	}
 
-	ppdb = g_new0 (MonoPPDBFile, 1);
-	ppdb->image = ppdb_image;
-	ppdb->doc_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) doc_free);
-	ppdb->method_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_free);
-
-	return ppdb;
+	return create_ppdb_file (ppdb_image);
 }
 
 void
@@ -718,4 +730,4 @@ mono_ppdb_lookup_method_async_debug_info (MonoDebugMethodInfo *minfo)
 		res->move_next_method_token [i] = mono_metadata_decode_value (pointer, &pointer);
 	}
 	return res;
-}
\ No newline at end of file
+}