3 files changed, 29 insertions, 0 deletions
diff --git a/decoder.c b/decoder.c
index ef7e15d..c379d4b 100644
--- a/decoder.c
+++ b/decoder.c
@@ -253,6 +253,9 @@ SRD_API int srd_decoder_load(const char *module_name)
 	struct srd_probe *p;
 	GSList *l;
 
+	if (!srd_check_init())
+		return SRD_ERR;
+
 	if (!module_name)
 		return SRD_ERR_ARG;
 
@@ -446,6 +449,12 @@ SRD_API char *srd_decoder_doc_get(const struct srd_decoder *dec)
 	PyObject *py_str;
 	char *doc;
 
+	if (!srd_check_init())
+		return NULL;
+
+	if (!dec)
+		return NULL;
+
 	if (!PyObject_HasAttrString(dec->py_mod, "__doc__"))
 		return NULL;
 
@@ -495,6 +504,12 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 	struct srd_session *sess;
 	GSList *l;
 
+	if (!srd_check_init())
+		return SRD_ERR;
+
+	if (!dec)
+		return SRD_ERR_ARG;
+
 	srd_dbg("Unloading protocol decoder '%s'.", dec->name);
 
 	/*
@@ -548,6 +563,9 @@ SRD_API int srd_decoder_load_all(void)
 	GError *error;
 	const gchar *direntry;
 
+	if (!srd_check_init())
+		return SRD_ERR;
+
 	if (!(dir = g_dir_open(DECODERS_DIR, 0, &error))) {
 		srd_err("Unable to open %s for reading.", DECODERS_DIR);
 		return SRD_ERR_DECODERS_DIR;
diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index 8fd9e52..aa626ca 100644
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -37,6 +37,7 @@ struct srd_session {
 
 /* srd.c */
 SRD_PRIV int srd_decoder_searchpath_add(const char *path);
+SRD_PRIV gboolean srd_check_init(void);
 
 /* session.c */
 SRD_PRIV int session_is_valid(struct srd_session *sess);
diff --git a/srd.c b/srd.c
index 07d7952..1c7f6f9 100644
--- a/srd.c
+++ b/srd.c
@@ -263,4 +263,14 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
 	return SRD_OK;
 }
 
+/* @private */
+SRD_PRIV gboolean srd_check_init(void)
+{
+	if (max_session_id < 0) {
+		srd_err("Library is not initialized.");
+		return FALSE;
+	} else
+		return TRUE;
+}
+
 /** @} */