Fix a potential segfault in sp_get_port_handle().

[libserialport.git] / libserialport_internal.h

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 27fae2a128569a309d912f2541b3183be176e309..6a682cb205c3b2399ef663a03f99eb374946541b 100644 (file)
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -192,6 +192,7 @@ extern void (*sp_debug_handler)(const char *format, ...);
        case SP_ERR_FAIL: RETURN_CODE(SP_ERR_FAIL); \
        case SP_ERR_MEM: RETURN_CODE(SP_ERR_MEM); \
        case SP_ERR_SUPP: RETURN_CODE(SP_ERR_SUPP); \
+       default: RETURN_CODE(SP_ERR_FAIL); \
        } \
 } while (0)
 #define RETURN_OK() RETURN_CODE(SP_OK);
@@ -223,7 +224,7 @@ extern void (*sp_debug_handler)(const char *format, ...);
 #define TRACE(fmt, ...) DEBUG_FMT("%s(" fmt ") called", __func__, __VA_ARGS__)
 #define TRACE_VOID() DEBUG_FMT("%s() called", __func__)
 
-#define TRY(x) do { int ret = x; if (ret != SP_OK) RETURN_CODEVAL(ret); } while (0)
+#define TRY(x) do { int retval = x; if (retval != SP_OK) RETURN_CODEVAL(retval); } while (0)
 
 SP_PRIV struct sp_port **list_append(struct sp_port **list, const char *portname);