Changeset: 2c068528683d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c068528683d
Modified Files:
clients/R/MonetDB.R/src/mapi.c
Branch: default
Log Message:
R Connector: Double free fix
diffs (18 lines):
diff --git a/clients/R/MonetDB.R/src/mapi.c b/clients/R/MonetDB.R/src/mapi.c
--- a/clients/R/MonetDB.R/src/mapi.c
+++ b/clients/R/MonetDB.R/src/mapi.c
@@ -43,9 +43,11 @@ SEXP mapiInit(void) {
SEXP mapiDisconnect(SEXP conn) {
CHECK_MAPI_SOCK(conn);
SOCKET *sock = R_ExternalPtrAddr(conn);
- shutdown(*sock, 2);
- R_ClearExternalPtr(conn);
- free(sock);
+ if (sock != NULL) {
+ shutdown(*sock, 2);
+ R_ClearExternalPtr(conn);
+ free(sock);
+ }
return R_NilValue;
}
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
