[anjuta] Fix a random crash when vim modelines are used
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] Fix a random crash when vim modelines are used
- Date: Wed, 8 Nov 2017 20:18:36 +0000 (UTC)
commit 228bbc54042094fe9114e0cf52eb69447216766a
Author: Sébastien Granjoux <seb sfo free fr>
Date: Fri Nov 3 22:29:16 2017 +0100
Fix a random crash when vim modelines are used
libanjuta/anjuta-modeline.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/libanjuta/anjuta-modeline.c b/libanjuta/anjuta-modeline.c
index 45eb514..7694d74 100644
--- a/libanjuta/anjuta-modeline.c
+++ b/libanjuta/anjuta-modeline.c
@@ -124,7 +124,7 @@ static gboolean
parse_vim_modeline (IndentationParams *params, const gchar *line, gint linenum)
{
gchar *ptr;
- gchar *end;
+ const gchar *end;
gchar *key;
gchar *value;
@@ -149,23 +149,22 @@ parse_vim_modeline (IndentationParams *params, const gchar *line, gint linenum)
}
ptr += 3;
- for (end = ptr;; end++)
+ for (end = ptr; *end != '\0'; end++)
{
if ((*end == ':') && (*(end-1) != '\\')) break;
}
- *end = '\0';
- while (*ptr != '\0')
+ while (ptr != end)
{
gchar sep;
while (g_ascii_isspace (*ptr)) ptr++;
- if (*ptr == '\0') break;
+ if (ptr == end) break;
/* Get key */
key = ptr++;
value = NULL;
- while ((*ptr != '\0') && (*ptr != '=') && !g_ascii_isspace(*ptr)) ptr++;
+ while ((ptr != end) && (*ptr != '=') && !g_ascii_isspace(*ptr)) ptr++;
sep = *ptr;
*ptr = '\0';
@@ -173,7 +172,7 @@ parse_vim_modeline (IndentationParams *params, const gchar *line, gint linenum)
{
/* Get value */
value = ++ptr;
- while ((*ptr != '\0') && !g_ascii_isspace(*ptr)) ptr++;
+ while ((ptr != end) && !g_ascii_isspace(*ptr)) ptr++;
sep = *ptr;
*ptr = '\0';
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]