Merge branch 'hotfix/2.40.1'

Author: shahramn

VERSION

@@ -1 +1 @@
-2.40.0
+2.40.1

src/grib_handle.cc

@@ -338,6 +338,11 @@ static bool can_create_clone_headers_only(const grib_handle* h)
     int err = grib_get_long(h, "isGridded", &isGridded);
     if (err || !isGridded) return false;
 
+    // ECC-2045: Input is already headers_only
+    long bitsPerValue = 0;
+    err = grib_get_long(h, "bitsPerValue", &bitsPerValue);
+    if (err || bitsPerValue == 0) return false;
+
     return true;
 }
 

tests/CMakeLists.txt

@@ -47,6 +47,7 @@ list(APPEND test_c_bins
     grib_ecc-1433
     grib_ecc-1764
     grib_ecc-2019
+    grib_ecc-2045
     bufr_ecc-517
     bufr_ecc-1288
     bufr_ecc-2011
@@ -292,6 +293,7 @@ if( HAVE_BUILD_TOOLS )
         grib_ecc-2002
         grib_ecc-2006
         grib_ecc-2019
+        grib_ecc-2045
         grib_modelName
         grib_sub_hourly
         grib_set_bytes

tests/grib_ecc-2045.cc

@@ -0,0 +1,52 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+#include "grib_api_internal.h"
+
+int main(int argc, char* argv[])
+{
+    int err = 0;
+    long lVal=0;
+
+    ECCODES_ASSERT(argc == 2);
+
+    printf("\nDoing file %s...\n", argv[1]);
+    FILE* in  = fopen(argv[1], "rb");
+    ECCODES_ASSERT(in);
+
+    grib_handle* handle = grib_handle_new_from_file(0, in, &err);
+    ECCODES_ASSERT(handle);
+    ECCODES_ASSERT(!err);
+
+    grib_handle* c = grib_handle_clone_headers_only(handle);
+    ECCODES_ASSERT(c);
+    lVal=-1; GRIB_CHECK( grib_get_long(c, "isMessageValid", &lVal), 0); printf("0. isMessageValid=%ld\n", lVal);
+    printf("0. /////// dump the 1st clone (grib1 headers_only)\n");
+    grib_dump_content(c, stdout, "wmo", 0, 0);
+
+    printf("\nSetting edition=2...\n");
+    GRIB_CHECK( grib_set_long(c, "edition", 2), 0);
+    printf("1. /////// dump the 1st clone (grib2 headers_only)\n");
+    grib_dump_content(c, stdout, "wmo", 0, 0);
+    lVal=-1; GRIB_CHECK( grib_get_long(c, "isMessageValid", &lVal), 0); printf("1. isMessageValid=%ld\n", lVal);
+
+    printf("\nClone the clone...\n");
+    grib_handle* c2 = grib_handle_clone_headers_only(c);
+    ECCODES_ASSERT(c2);
+    printf("2. /////// dump the 2nd clone (grib2 headers_only)\n");
+    grib_dump_content(c2, stdout, "wmo", 0, 0);
+    lVal=-1; GRIB_CHECK( grib_get_long(c2, "isMessageValid", &lVal), 0); printf("2. isMessageValid=%ld\n", lVal);
+
+    grib_handle_delete(handle);
+    grib_handle_delete(c);
+    grib_handle_delete(c2);
+    fclose(in);
+    printf("All OK.\n");
+    return 0;
+}

tests/grib_ecc-2045.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+# ---------------------------------------------------------
+# This is the test for the JIRA issue ECC-2045
+# GRIB: cannot clone repeatedly with headers only
+# ---------------------------------------------------------
+
+REDIRECT=/dev/null
+
+label="grib_ecc-2045_test"
+tempGrib=temp.$label.grib
+tempLog=temp.$label.log
+
+infiles="GRIB1.tmpl GRIB2.tmpl sh_ml_grib1.tmpl sh_ml_grib2.tmpl"
+for f in $infiles; do
+    $EXEC $test_dir/grib_ecc-2045 $ECCODES_SAMPLES_PATH/$f
+done
+
+# infile=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
+# $EXEC $test_dir/grib_ecc-2045 $infile
+
+# infile=$ECCODES_SAMPLES_PATH/sh_ml_grib1.tmpl
+# $EXEC $test_dir/grib_ecc-2045 $infile
+
+# infile=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
+# $EXEC $test_dir/grib_ecc-2045 $infile
+
+# infile=$ECCODES_SAMPLES_PATH/sh_ml_grib2.tmpl
+# $EXEC $test_dir/grib_ecc-2045 $infile
+
+
+# Clean up
+rm -f $tempGrib $tempLog