diff options
| author | Dan Gudmundsson <[email protected]> | 2011-03-02 11:24:07 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-03-02 11:24:07 +0100 |
| commit | 29b1f35b3242ff80ddee14a833d5f3dcc4de9f65 (patch) | |
| tree | a410271358f5fc357e0e4b1053893e9f915f35ca /lib/wx/c_src | |
| parent | cdf46e658a3a11b97f6179c0d416dc8f2e975509 (diff) | |
| parent | 1bf0af6284aca47a6b3a823c4dd682e8fb8d4135 (diff) | |
| download | otp-29b1f35b3242ff80ddee14a833d5f3dcc4de9f65.tar.gz otp-29b1f35b3242ff80ddee14a833d5f3dcc4de9f65.tar.bz2 otp-29b1f35b3242ff80ddee14a833d5f3dcc4de9f65.zip | |
Merge branch 'dgud/wx/unload-driver/OTP-9080' into dev
* dgud/wx/unload-driver/OTP-9080:
Fix bad string copy during initialization
Fix start args
Fixed coredump when graphics could not be initiated
Diffstat (limited to 'lib/wx/c_src')
| -rw-r--r-- | lib/wx/c_src/wxe_driver.c | 6 | ||||
| -rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c index 310325ea26..2404b13cc3 100644 --- a/lib/wx/c_src/wxe_driver.c +++ b/lib/wx/c_src/wxe_driver.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2010. All Rights Reserved. + * Copyright Ericsson AB 2008-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -117,8 +117,7 @@ wxe_driver_start(ErlDrvPort port, char *buff) if(WXE_DRV_PORT == 0) { for(; *buff != 32; buff++); buff++; - erl_wx_privdir = malloc(strlen(buff)); - strcpy(erl_wx_privdir, buff); + erl_wx_privdir = strdup(buff); WXE_DRV_PORT = port; wxe_master = data; @@ -146,7 +145,6 @@ static void wxe_driver_unload(void) { // fprintf(stderr, "%s:%d: UNLOAD \r\n", __FILE__,__LINE__); - meta_command(WXE_SHUTDOWN, wxe_master); stop_native_gui(wxe_master); unload_native_gui(); free(wxe_master); diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp index 79d1a29519..2a2ec1e40b 100644 --- a/lib/wx/c_src/wxe_impl.cpp +++ b/lib/wx/c_src/wxe_impl.cpp @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2010. All Rights Reserved. + * Copyright Ericsson AB 2008-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -117,6 +117,9 @@ int start_native_gui(wxe_data *sd) void stop_native_gui(wxe_data *sd) { + if(wxe_status == WXE_INITIATED) { + meta_command(WXE_SHUTDOWN, sd); + } erl_drv_thread_join(wxe_thread, NULL); erl_drv_mutex_destroy(wxe_status_m); erl_drv_cond_destroy(wxe_status_c); @@ -182,8 +185,8 @@ void *wxe_main_loop(void *vpdl) { int result; int argc = 1; - char * temp = (char *) "Erlang\0"; - char ** argv = &temp; + char * temp = (char *) "Erlang"; + char * argv[] = {temp,NULL}; ErlDrvPDL pdl = (ErlDrvPDL) vpdl; driver_pdl_inc_refc(pdl); |