From 0dc9af30c3dd673342f8b5f49b43cbdb8a1221c4 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 6 May 2013 16:58:55 +0200
Subject: Fix crash when reporting stale driver select

---
 erts/emulator/beam/erl_port_task.c |  3 +++
 erts/emulator/beam/global.h        |  4 ++--
 erts/emulator/beam/io.c            | 26 +++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'erts/emulator/beam')

diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 0ed08bee01..a739da0e7a 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -1912,18 +1912,21 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p)
 		break;
 	    case ERTS_PORT_TASK_INPUT:
 		erts_stale_drv_select(pp->common.id,
+				      ERTS_Port2ErlDrvPort(pp),
 				      ptp->u.alive.td.io.event,
 				      DO_READ,
 				      1);
 		break;
 	    case ERTS_PORT_TASK_OUTPUT:
 		erts_stale_drv_select(pp->common.id,
+				      ERTS_Port2ErlDrvPort(pp),
 				      ptp->u.alive.td.io.event,
 				      DO_WRITE,
 				      1);
 		break;
 	    case ERTS_PORT_TASK_EVENT:
 		erts_stale_drv_select(pp->common.id,
+				      ERTS_Port2ErlDrvPort(pp),
 				      ptp->u.alive.td.io.event,
 				      0,
 				      1);
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 012c1c7e6a..2c1e1050e6 100755
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -729,10 +729,10 @@ void erts_raw_port_command(Port*, byte*, Uint);
 void driver_report_exit(ErlDrvPort, int);
 LineBuf* allocate_linebuf(int);
 int async_ready(Port *, void*);
-ErtsPortNames *erts_get_port_names(Eterm);
+ErtsPortNames *erts_get_port_names(Eterm, ErlDrvPort);
 void erts_free_port_names(ErtsPortNames *);
 Uint erts_port_ioq_size(Port *pp);
-void erts_stale_drv_select(Eterm, ErlDrvEvent, int, int);
+void erts_stale_drv_select(Eterm, ErlDrvPort, ErlDrvEvent, int, int);
 
 Port *erts_get_heart_port(void);
 
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 43918a7141..0f6b3aa8a7 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -4977,7 +4977,8 @@ int async_ready(Port *p, void* data)
 static void
 report_missing_drv_callback(Port *p, char *drv_type, char *callback)
 {
-    ErtsPortNames *pnp = erts_get_port_names(p->common.id);
+    ErtsPortNames *pnp = erts_get_port_names(p->common.id,
+					     ERTS_Port2ErlDrvPort(p));
     char *unknown = "<unknown>";
     char *drv_name = pnp->driver_name ? pnp->driver_name : unknown;
     char *prt_name = pnp->name ? pnp->name : unknown;
@@ -4992,15 +4993,25 @@ report_missing_drv_callback(Port *p, char *drv_type, char *callback)
 
 void
 erts_stale_drv_select(Eterm port,
+		      ErlDrvPort drv_port,
 		      ErlDrvEvent hndl,
 		      int mode,
 		      int deselect)
 {
     char *type;
-    ErlDrvPort drv_port = ERTS_Port2ErlDrvPort(erts_port_lookup_raw(port));
-    ErtsPortNames *pnp = erts_get_port_names(port);
+    ErtsPortNames *pnp;
     erts_dsprintf_buf_t *dsbufp;
 
+    if (drv_port == ERTS_INVALID_ERL_DRV_PORT) {
+	Port *prt = erts_port_lookup_raw(port);
+	if (prt)
+	    drv_port = ERTS_Port2ErlDrvPort(port);
+	else
+	    drv_port = ERTS_INVALID_ERL_DRV_PORT;
+    }
+
+    pnp = erts_get_port_names(port, drv_port);
+
     switch (mode) {
     case ERL_DRV_READ | ERL_DRV_WRITE:
 	type = "Input/Output";
@@ -5035,12 +5046,16 @@ erts_stale_drv_select(Eterm port,
 }
 
 ErtsPortNames *
-erts_get_port_names(Eterm id)
+erts_get_port_names(Eterm id, ErlDrvPort drv_port)
 {
-    Port *prt = erts_port_lookup_raw(id);
+    Port *prt;
     ErtsPortNames *pnp;
     ASSERT(is_nil(id) || is_internal_port(id));
 
+    prt = ERTS_ErlDrvPort2Port(drv_port);
+    if (prt == ERTS_INVALID_ERL_DRV_PORT)
+	prt = erts_port_lookup_raw(id);
+
     if (!prt) {
 	pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, sizeof(ErtsPortNames));
 	pnp->name = NULL;
@@ -5052,6 +5067,7 @@ erts_get_port_names(Eterm id)
 	size_t pnp_len = sizeof(ErtsPortNames);
 #ifndef DEBUG
 	pnp_len += 100; /* In most cases 100 characters will be enough... */
+	ASSERT(prt->common.id == id);
 #endif
 	pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, pnp_len);
 	do {
-- 
cgit v1.2.3