Merge branch 'master' into xkb

Conflicts:
	config.make.in
	configure.in

2 files changed, 2 insertions, 4 deletions

diff --git a/proc/info.c b/proc/info.c
index 11625442..f35ad166 100644
--- a/proc/info.c
+++ b/proc/info.c
@@ -228,8 +228,6 @@ get_vector (task_t task,
       if (err)
 	return err;
 
-      /* XXX fault bad here */
-
       /* Scan for a null.  */
       for (t = (vm_address_t *) (data + (scanned - readaddr));
 	   t < (vm_address_t *) (data + readlen);
@@ -248,7 +246,7 @@ get_vector (task_t task,
 
       /* If we didn't find the null terminator, then we will loop
 	 to read an additional page.  */
-      scanned = data + readlen;
+      scanned = readaddr + readlen;
       munmap ((caddr_t) data, readlen);
     } while (!err && *vec == NULL);
 
diff --git a/proc/mgt.c b/proc/mgt.c
index 5373d101..1180c700 100644
--- a/proc/mgt.c
+++ b/proc/mgt.c
@@ -499,7 +499,7 @@ S_proc_exception_raise (mach_port_t excport,
 
       mach_port_destroy (mach_task_self (), thread);
 
-      return 0;
+      return MIG_NO_REPLY;
     }
 
 }