From c6247aaaf75842219d6c9b319ab700d7c82bb418 Mon Sep 17 00:00:00 2001 From: Avinash Sonawane Date: Wed, 27 Oct 2021 16:22:18 +0530 Subject: [PATCH] Return if `ft` is NULL Found by: scan-build --- src/build.c | 5 +++-- src/filetypes.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/build.c b/src/build.c index 4085fd7bb0..d43ba9c9f3 100644 --- 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 index 5a50fd6891..fccd817f84 100644 --- 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;