Merge branch 'main' of github.com:coolbutuseless/yyjsonr

coolbutuseless · Mar 6, 2024 · 2637624 · 2637624
2 parents 3020006 + fe83868
commit 2637624
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt
@@ -0,0 +1,14 @@
+pybryt
+pylint
+datascience
+otter-grader
+numpy
+pandas
+scipy
+folium>=0.9.1
+matplotlib
+ipywidgets>=7.0.0
+bqplot
+nbinteract>=0.0.12
+okpy
+scikit-learn
diff --git a/src/R-yyjson-parse.c b/src/R-yyjson-parse.c
@@ -1961,8 +1961,11 @@ SEXP parse_from_gzfile_(SEXP filename_, SEXP parse_opts_) {
 
   fseek(fp, -4, SEEK_END);
   int32_t uncompressed_len;
-  fread(&uncompressed_len, 4, 1, fp);
+  size_t nbytes = fread(&uncompressed_len, 1, 4, fp);
   fclose(fp);
+  if (nbytes != 4) {
+    error("Couldn't read size from end of file: %s", filename);
+  }
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   // Allocate a buffer to hold the uncompressed file.
@@ -1977,8 +1980,11 @@ SEXP parse_from_gzfile_(SEXP filename_, SEXP parse_opts_) {
   // Uncompress file to buffer
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   gzFile gzfp = gzopen(filename, "r");
-  gzread(gzfp, (void *)buf, uncompressed_len);
+  int N = gzread(gzfp, (void *)buf, uncompressed_len);
   gzclose(gzfp);
+  if (N != uncompressed_len) {
+    error("Incorrect number of bytes read. Expected %i, read %i", uncompressed_len, N);
+  }
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   // Parse buffer as string