HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed possible segfault when replacing tabs by spaces.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@695 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-08-11 17:19:16 +00:00
parent a01c0eaec3
commit 58f2a195ad
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-08-11 Enrico Tröger <enrico.troeger@uvena.de>
* src/document.c:
Changed SEARCH_NOT_FOUND_TXT.
Fixed possible segfault when replacing tabs by spaces.
2006-08-09 Enrico Tröger <enrico.troeger@uvena.de>
* doc/geany.docbook:

9
src/document.c
View File

@ -797,7 +797,8 @@ void document_save_file(gint idx, gboolean force)
}
#define SEARCH_NOT_FOUND_TXT _("The match \"%s\" was not found. Wrap search around the document?")
#define SEARCH_NOT_FOUND_TXT _("The document has been searched completely but the match \"%s\" \
was not found. Wrap search around the document?")
/* special search function, used from the find entry in the toolbar */
void document_find_next(gint idx, const gchar *text, gint flags, gboolean find_button, gboolean inc)
@ -1335,7 +1336,7 @@ void document_replace_tabs(gint idx)
return;
}
text = g_malloc(len + (tabs_amount * (tab_w - 1)));
text = g_malloc(len + (tabs_amount * (tab_w - 1)) + 1);
for (i = 0; i < len; i++)
{
@ -1354,7 +1355,9 @@ void document_replace_tabs(gint idx)
text[j++] = data[i];
}
}
geany_debug("tabs_amount: %d, len: %d, %d == %d", tabs_amount, len, len + (tabs_amount * (tab_w - 1)), j);
text[j] = '\0';
geany_debug("Replacing Tabs: tabs_amount: %d, text len: %d, j: %d", tabs_amount, len, j);
sci_set_text(doc_list[idx].sci, text);
sci_set_current_position(doc_list[idx].sci, pos);