From 6fa2e814918c9fd9c9449528f6c9924ca3d85e53 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Sat, 26 Sep 2009 03:33:26 +0000
Subject: [PATCH] Correct handling of pointer array indexing

This commit was SVN r22017.
---
 orte/tools/orterun/debuggers.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/orte/tools/orterun/debuggers.c b/orte/tools/orterun/debuggers.c
index 215c026f2f..a90229a781 100644
--- a/orte/tools/orterun/debuggers.c
+++ b/orte/tools/orterun/debuggers.c
@@ -630,8 +630,8 @@ void orte_debugger_init_before_spawn(orte_job_t *jdata)
  */
 void orte_debugger_init_after_spawn(orte_job_t *jdata)
 {
-    orte_proc_t **procs;
-    orte_app_context_t *appctx, **apps;
+    orte_proc_t *proc;
+    orte_app_context_t *appctx;
     orte_vpid_t i, j;
     opal_buffer_t buf;
     orte_process_name_t rank0;
@@ -662,19 +662,19 @@ void orte_debugger_init_after_spawn(orte_job_t *jdata)
     }
     
     /* initialize MPIR_proctable */
-    procs = (orte_proc_t**)jdata->procs->addr;
-    apps = (orte_app_context_t**)jdata->apps->addr;
     for (j=0; j < jdata->num_procs; j++) {
-        if (NULL == procs[j]) {
-            opal_output(0, "Error: undefined proc at position %ld\n", (long)j);
+        if (NULL == (proc = (orte_proc_t*)opal_pointer_array_get_item(jdata->procs, j))) {
+            continue;
         }
         /* store this data in the location whose index
          * corresponds to the proc's rank
          */
-        i = procs[j]->name.vpid;
-        appctx = apps[procs[j]->app_idx];
+        i = proc->name.vpid;
+        if (NULL == (appctx = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, proc->app_idx))) {
+            continue;
+        }
         
-        MPIR_proctable[i].host_name = strdup(procs[j]->node->name);
+        MPIR_proctable[i].host_name = strdup(proc->node->name);
         if ( 0 == strncmp(appctx->app, OPAL_PATH_SEP, 1 )) { 
             MPIR_proctable[i].executable_name = 
             opal_os_path( false, appctx->app, NULL ); 
@@ -682,7 +682,7 @@ void orte_debugger_init_after_spawn(orte_job_t *jdata)
             MPIR_proctable[i].executable_name =
             opal_os_path( false, appctx->cwd, appctx->app, NULL ); 
         } 
-        MPIR_proctable[i].pid = procs[j]->pid;
+        MPIR_proctable[i].pid = proc->pid;
     }
 
     if (orte_debug_flag) {