Add a missing arg check to the sdb protocol code

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index d0ecfa5caac4a216d0d6ea5b17ab96763b2529e9..d5eb9f0fab49e9ec99ac3300af81712ce0427d16 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -101,7 +101,7 @@ boehm_binaries  = mono
 endif
 
 if HOST_WIN32
-bin_PROGRAMS = mono monow
+bin_PROGRAMS = $(boehm_binaries) $(sgen_binaries) monow
 else
 bin_PROGRAMS = $(boehm_binaries) $(sgen_binaries)
 endif

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index d59f3a8d0eea1ff3f0014c8dfe27e80ec0754d54..cfa66e88e2a6ab9520b97ed03476ac3956b65cc0 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -6513,9 +6513,13 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                break;
        }
        case CMD_TYPE_GET_CATTRS: {
-               MonoClass *attr_klass = decode_typeid (p, &p, end, NULL, &err);
+               MonoClass *attr_klass;
                MonoCustomAttrInfo *cinfo;
 
+               attr_klass = decode_typeid (p, &p, end, NULL, &err);
+               if (!attr_klass)
+                       return err;
+
                cinfo = mono_custom_attrs_from_class (klass);
 
                buffer_add_cattrs (buf, domain, klass->image, attr_klass, cinfo);