From 6765111f11f821daf2358e3cee68cce79776a9fd Mon Sep 17 00:00:00 2001
From: wkliao <wkliao@users.noreply.github.com>
Date: Sun, 1 May 2022 17:11:57 -0500
Subject: [PATCH] add note on an early check for buftype when bufcount is -1

---
 src/drivers/common/dtype_decode.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/drivers/common/dtype_decode.c b/src/drivers/common/dtype_decode.c
index 8de036d8e..80d386b17 100644
--- a/src/drivers/common/dtype_decode.c
+++ b/src/drivers/common/dtype_decode.c
@@ -516,7 +516,28 @@ ncmpii_buftype_decode(int               ndims,
     for (i=0; i<ndims; i++)
         fnelems *= count[i];
 
-    if (bufcount == -1) { /* the subroutine is called from a high-level API */
+    if (bufcount == -1) {
+        /* This is called from a high-level API, buftype must be the I/O
+         * buffer's data type, a predefined MPI datatype.
+         */
+#if 0
+        /* The same error will also be captured in ncmpio_pack_xbuf(),
+         * ncmpio_unpack_xbuf(), ncmpii_putn_xxx(), or ncmpii_getn_NC_xxx().
+         */
+        if (buftype != MPI_CHAR                &&
+            buftype != MPI_SIGNED_CHAR         &&
+            buftype != MPI_UNSIGNED_CHAR       &&
+            buftype != MPI_SHORT               &&
+            buftype != MPI_UNSIGNED_SHORT      &&
+            buftype != MPI_INT                 &&
+            buftype != MPI_UNSIGNED            &&
+            buftype != MPI_LONG                &&
+            buftype != MPI_FLOAT               &&
+            buftype != MPI_DOUBLE              &&
+            buftype != MPI_LONG_LONG_INT       &&
+            buftype != MPI_UNSIGNED_LONG_LONG)
+            DEBUG_RETURN_ERROR(NC_EBADTYPE)
+#endif
         *nelems   = fnelems;
         *etype    = buftype; /* buftype is an MPI primitive data type */
         MPI_Type_size(buftype, esize);