X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2e52ba36cb91c04eb37544f2205286db700ff730..4f9b139ab9e8d46895c92865335b729f967abef2:/rsync.c

diff --git a/rsync.c b/rsync.c
index 573641ab..7f8d65cb 100644
--- a/rsync.c
+++ b/rsync.c
@@ -134,8 +134,6 @@ void setup_iconv(void)
 # endif
 }
 
-# ifdef ICONV_OPTION
-
 /* This function converts the characters in the "in" xbuf into characters
  * in the "out" xbuf.  The "len" of the "in" xbuf is used starting from its
  * "pos".  The "size" of the "out" xbuf restricts how many characters can be
@@ -205,7 +203,6 @@ int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags)
 
 	return errno ? -1 : 0;
 }
-# endif
 #endif
 
 int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
@@ -268,7 +265,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
 	  invalid_ndx:
 		rprintf(FERROR,
 			"Invalid file index: %d (%d - %d) with iflags %x [%s]\n",
-			ndx, first_flist->ndx_start - 1, first_flist->prev->ndx_end,
+			ndx, first_flist ? first_flist->ndx_start - 1 : -1,
+			first_flist ? first_flist->prev->ndx_end : -1,
 			iflags, who_am_i());
 		exit_cleanup(RERR_PROTOCOL);
 	}