xnu-1228.5.18.tar.gz

[apple/xnu.git] / osfmk / kdp / kdp_udp.c

diff --git a/osfmk/kdp/kdp_udp.c b/osfmk/kdp/kdp_udp.c
index a513398fe9f85d780e10afaee71e6dcff54e48cd..e47f63dfc09e98ba7d7c2df708372752c1abe0d7 100644 (file)
--- a/osfmk/kdp/kdp_udp.c
+++ b/osfmk/kdp/kdp_udp.c
@@ -1073,7 +1073,9 @@ kdp_raise_exception(
      * do this. I think the client and the host can get out of sync.
      */
     kdp.saved_state = saved_state;
-     
+    kdp.kdp_cpu = cpu_number();
+    kdp.kdp_thread = current_thread();
+
     if (pkt.input)
        kdp_panic("kdp_raise_exception");
 
@@ -1416,22 +1418,19 @@ kdp_get_xnu_version(char *versionbuf)
        char *vptr;
 
        strlcpy(vstr, "custom", 10);
-       if (version) {
-               if (kdp_vm_read(version, versionbuf, 95)) {
-                       versionbuf[94] = '\0';
-                       versionpos = strnstr(versionbuf, "xnu-", 90);
-                       if (versionpos) {
-                               strncpy(vstr, versionpos, sizeof(vstr));
-                               vstr[sizeof(vstr)-1] = '\0';
-                               vptr = vstr + 4; /* Begin after "xnu-" */
-                               while (*vptr && (isdigit(*vptr) || *vptr == '.'))
-                                       vptr++;
+       if (strlcpy(versionbuf, version, 95) < 95) {
+               versionpos = strnstr(versionbuf, "xnu-", 90);
+               if (versionpos) {
+                       strncpy(vstr, versionpos, sizeof(vstr));
+                       vstr[sizeof(vstr)-1] = '\0';
+                       vptr = vstr + 4; /* Begin after "xnu-" */
+                       while (*vptr && (isdigit(*vptr) || *vptr == '.'))
+                               vptr++;
+                       *vptr = '\0';
+                       /* Remove trailing period, if any */
+                       if (*(--vptr) == '.')
                                *vptr = '\0';
-                               /* Remove trailing period, if any */
-                               if (*(--vptr) == '.')
-                                       *vptr = '\0';
-                               retval = 0;
-                       }
+                       retval = 0;
                }
        }
        strlcpy(versionbuf, vstr, KDP_MAXPACKET);