diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /proc/info.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'proc/info.c')
| -rw-r--r-- | proc/info.c | 4 |
1 files changed, 1 insertions, 3 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); |