cdiInqKeyString: set string[maxlength-1] = '\0'

e6630d8d · Uwe Schulzweida · c1095b0c · e6630d8d
Commit e6630d8d authored Jul 07, 2020 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/cdi_key.c src/cdi_key.c +3 -1

No files found.
--- a/src/cdi_key.c
+++ b/src/cdi_key.c
@@ -662,10 +662,12 @@ int cdiInqKeyString(int cdiID, int varID, int key, char *string, int *length)
  xassert(string != NULL);
  xassert(length != NULL);

-  string[0] = '\0';
+  int maxlength = *length;
+  if (maxlength > 0) string[0] = '\0';

  int status = cdiInqKeyBytes(cdiID, varID, key, (unsigned char *) string, length);
  if (status != CDI_NOERR) *length = 0;
+  else string[maxlength-1] = '\0';

  return status;
 }