Commit 42ac5368 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Allowing an array parameter to be NULL.

This fixes Savannah bug #46420.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5457 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 5 additions and 3 deletions
+5 -3
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
* src/text.c (add_undo, update_undo, do_undo, do_redo), src/nano.h: * src/text.c (add_undo, update_undo, do_undo, do_redo), src/nano.h:
Store and retrieve the correct file size before and after an action. Store and retrieve the correct file size before and after an action.
This fixes Savannah bug #45523. This fixes Savannah bug #45523.
* src/files.c (free_chararray): Allow the parameter to be NULL.
This fixes Savannah bug #46420.
2015-11-29 Benno Schulenberg <bensberg@justemail.net> 2015-11-29 Benno Schulenberg <bensberg@justemail.net>
* src/color.c (reset_multis): Evaluate correctly whether to reset * src/color.c (reset_multis): Evaluate correctly whether to reset
......
...@@ -460,8 +460,7 @@ void browser_init(const char *path, DIR *dir) ...@@ -460,8 +460,7 @@ void browser_init(const char *path, DIR *dir)
rewinddir(dir); rewinddir(dir);
if (filelist != NULL) free_chararray(filelist, filelist_len);
free_chararray(filelist, filelist_len);
filelist_len = i; filelist_len = i;
......
...@@ -2553,7 +2553,8 @@ int diralphasort(const void *va, const void *vb) ...@@ -2553,7 +2553,8 @@ int diralphasort(const void *va, const void *vb)
* elements. */ * elements. */
void free_chararray(char **array, size_t len) void free_chararray(char **array, size_t len)
{ {
assert(array != NULL); if (array == NULL)
return;
for (; len > 0; len--) for (; len > 0; len--)
free(array[len - 1]); free(array[len - 1]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment