fixed GH pocoproject#958: Bug while reading X509Certificate subjectName

obiltschnig · obiltschnig · commit df36ae6a04bf · 2015-09-30T16:53:47.000+02:00
diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp
@@ -205,10 +205,10 @@ std::string X509Certificate::issuerName(NID nid) const
 	if (X509_NAME* issuer = X509_get_issuer_name(_pCert))
     {
 		char buffer[NAME_BUFFER_SIZE];
-		X509_NAME_get_text_by_NID(issuer, nid, buffer, sizeof(buffer));
-		return std::string(buffer);
+		if (X509_NAME_get_text_by_NID(issuer, nid, buffer, sizeof(buffer)) >= 0)
+			return std::string(buffer);
     }
-    else return std::string();
+    return std::string();
 }
 
 
@@ -217,10 +217,10 @@ std::string X509Certificate::subjectName(NID nid) const
 	if (X509_NAME* subj = X509_get_subject_name(_pCert))
     {
 		char buffer[NAME_BUFFER_SIZE];
-		X509_NAME_get_text_by_NID(subj, nid, buffer, sizeof(buffer));
-		return std::string(buffer);
+		if (X509_NAME_get_text_by_NID(subj, nid, buffer, sizeof(buffer)) >= 0)
+			return std::string(buffer);
     }
-    else return std::string();
+    return std::string();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,10 @@ std::string X509Certificate::issuerName(NID nid) const`
`205`	`205`	`if (X509_NAME* issuer = X509_get_issuer_name(_pCert))`
`206`	`206`	`{`
`207`	`207`	`char buffer[NAME_BUFFER_SIZE];`
`208`		`- X509_NAME_get_text_by_NID(issuer, nid, buffer, sizeof(buffer));`
`209`		`- return std::string(buffer);`
	`208`	`+ if (X509_NAME_get_text_by_NID(issuer, nid, buffer, sizeof(buffer)) >= 0)`
	`209`	`+ return std::string(buffer);`
`210`	`210`	`}`
`211`		`- else return std::string();`
	`211`	`+ return std::string();`
`212`	`212`	`}`
`213`	`213`
`214`	`214`
`@@ -217,10 +217,10 @@ std::string X509Certificate::subjectName(NID nid) const`
`217`	`217`	`if (X509_NAME* subj = X509_get_subject_name(_pCert))`
`218`	`218`	`{`
`219`	`219`	`char buffer[NAME_BUFFER_SIZE];`
`220`		`- X509_NAME_get_text_by_NID(subj, nid, buffer, sizeof(buffer));`
`221`		`- return std::string(buffer);`
	`220`	`+ if (X509_NAME_get_text_by_NID(subj, nid, buffer, sizeof(buffer)) >= 0)`
	`221`	`+ return std::string(buffer);`
`222`	`222`	`}`
`223`		`- else return std::string();`
	`223`	`+ return std::string();`
`224`	`224`	`}`
`225`	`225`
`226`	`226`