Optionally calculate string length in rpmSigInfoParse()

Not used yet, but doing this here centrally, after validating the
type otherwise etc makes sense.

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/signature.c b/lib/signature.c
index c7ae0d611..67f649c54 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -74,18 +74,21 @@ rpmRC rpmSigInfoParse(rpmtd td, const char *origin,
 	break;
     }
 
-    if (tagsize && (td->flags & RPMTD_IMMUTABLE) && tagsize != td->size) {
-	rasprintf(msg, _("%s tag %u: BAD, invalid size %u"),
-			origin, td->tag, td->size);
-	goto exit;
-    }
-
     if (tagtype && tagtype != td->type) {
 	rasprintf(msg, _("%s tag %u: BAD, invalid type %u"),
 			origin, td->tag, td->type);
 	goto exit;
     }
 
+    if (td->type == RPM_STRING_TYPE && td->size == 0)
+	td->size = strlen(td->data) + 1;
+
+    if (tagsize && (td->flags & RPMTD_IMMUTABLE) && tagsize != td->size) {
+	rasprintf(msg, _("%s tag %u: BAD, invalid size %u"),
+			origin, td->tag, td->size);
+	goto exit;
+    }
+
     if (sinfo->type == RPMSIG_SIGNATURE_TYPE) {
 	if (pgpPrtParams(td->data, td->count, PGPTAG_SIGNATURE, &sig)) {
 	    rasprintf(msg, _("%s tag %u: BAD, invalid OpenPGP signature"),