ECC-782: Multi-field GRIB: crash in grib_handle_new_from_file_multi

ecmwf · May 16, 2024 · bfd47cf · bfd47cf
1 parent a299e60
commit bfd47cf
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/grib_handle.cc b/src/grib_handle.cc
@@ -637,7 +637,6 @@ static grib_handle* grib_handle_new_multi(grib_context* c, unsigned char** data,
         while (grib2_get_next_section((unsigned char*)message, olen, &secbegin, &seclen, &secnum, &err)) {
             // seccount++;
             /*printf("   - %d - section %d length=%d\n",(int)seccount,(int)secnum,(int)seclen);*/
-
             gm->sections[secnum]        = secbegin;
             gm->sections_length[secnum] = seclen;
 
@@ -686,6 +685,11 @@ static grib_handle* grib_handle_new_multi(grib_context* c, unsigned char** data,
                 break;
             }
         }
+        // ECC-782
+        if (err == GRIB_INVALID_SECTION_NUMBER) {
+            grib_context_log(c, GRIB_LOG_ERROR, "%s: Failed to get section info (%s)", __func__, grib_get_error_message(err));
+            return NULL;
+        }
     }
     else if (edition == 3) {
         *error = GRIB_UNSUPPORTED_EDITION;
@@ -840,6 +844,11 @@ static grib_handle* grib_handle_new_from_file_multi(grib_context* c, FILE* f, in
                 break;
             }
         }
+        // ECC-782
+        if (err == GRIB_INVALID_SECTION_NUMBER) {
+            grib_context_log(c, GRIB_LOG_ERROR, "%s: Failed to get section info (%s)", __func__, grib_get_error_message(err));
+            return NULL;
+        }
     }
     else if (edition == 3) {
         /* GRIB3: Multi-field mode not yet supported */