Return if ft is NULL

Found by: scan-build
geany · Nov 25, 2021 · c6247aa · c6247aa
1 parent 2dfb361
commit c6247aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/build.c b/src/build.c
@@ -448,9 +448,10 @@ gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, guint *from)
 			GeanyDocument *doc = document_get_current();
 			if (doc != NULL)
 				ft = doc->file_type;
+			if (ft == NULL)
+				return NULL;
 		}
-		if (ft == NULL)
-			return NULL;
+
 		return_nonblank_regex(GEANY_BCS_PROJ, ft->priv->projerror_regex_string);
 		return_nonblank_regex(GEANY_BCS_HOME_FT, ft->priv->homeerror_regex_string);
 		return_nonblank_regex(GEANY_BCS_FT, ft->error_regex_string);

diff --git a/src/filetypes.c b/src/filetypes.c
@@ -1284,7 +1284,10 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message,
 		doc = document_get_current();
 		if (doc != NULL)
 			ft = doc->file_type;
+		if (ft == NULL)
+			return FALSE;
 	}
+
 	tmp = build_get_regex(build_info.grp, ft, NULL);
 	if (tmp == NULL)
 		return FALSE;