diff options
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index bea6b53220..bf10f4ccdc 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -50,7 +50,8 @@ merge_open_in_files(int in_file_count, char *const *in_file_names, merge_in_file_t **in_files, int *err, gchar **err_info, int *err_fileno) { - int i, j; + gint i; + gint j; size_t files_size = in_file_count * sizeof(merge_in_file_t); merge_in_file_t *files; gint64 size; @@ -73,7 +74,7 @@ merge_open_in_files(int in_file_count, char *const *in_file_names, } size = wtap_file_size(files[i].wth, err); if (size == -1) { - for (j = 0; j <= i; j++) + for (j = 0; j + 1 > j && j <= i; j++) wtap_close(files[j].wth); *err_fileno = i; return FALSE; |