The R Project SVN – R – Diff – /trunk/src/main/gzio.h

     Bytef *start = (Bytef*) buf; /* starting point for crc computation */
     Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
     if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
+    if (s->z_err == Z_DATA_ERROR) {
+	warning("invalid or incomplete compressed data");
+	return -1;
+    } else if(s->z_err == Z_ERRNO) {
+	warning("error reading the file");
+	return -1;
+    }
     if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
     next_out = (Byte*) buf;
     s->stream.next_out = (Bytef*) buf;
     s->stream.avail_out = len;
             /* Check CRC and original size */
             s->crc = crc32(s->crc, start, (uInt) (s->stream.next_out - start));
             start = s->stream.next_out;
             if (getLong(s) != s->crc) {
+		warning("invalid or incomplete compressed data");
                 s->z_err = Z_DATA_ERROR;
             } else {
                 (void)getLong(s);
                 /* The uncompressed length returned by above getlong() may be
                  * different from s->out in case of concatenated .gz files.
         if (s->z_err != Z_OK || s->z_eof) break;
+    }
     s->crc = crc32(s->crc, start, (uInt) (s->stream.next_out - start));
     if (len == s->stream.avail_out &&
-        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
+        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) {
+	if(s->z_err == Z_DATA_ERROR)
+	    warning("invalid or incomplete compressed data");
+	else if(s->z_err == Z_ERRNO)
+	    warning("error reading the file");
-        return -1;
+	return -1;
+    }
     return (int)(len - s->stream.avail_out);
+}
 /* for devPS.c */
 char *R_gzgets(gzFile file, char *buf, int len)

The R Project SVN R

(root)/trunk/src/main/gzio.h – Rev 55623 → 67382