[XrdCrypto] Fix potential memory related issues.

xrootd · Jan 17, 2018 · 055c0ca · 055c0ca
1 parent 7699ef5
commit 055c0ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/XrdCrypto/XrdCryptoX509Chain.cc b/src/XrdCrypto/XrdCryptoX509Chain.cc
@@ -586,7 +586,7 @@ int XrdCryptoX509Chain::Reorder()
    }
 
    // Move it in first position if not yet there
-   if (nr != begin) { 
+   if (nr && nr != begin) {
       np->SetNext(nr->Next()); // short cut old position
       nr->SetNext(begin);      // set our next to present begin
       if (end == nr)           // Update end

diff --git a/src/XrdCrypto/XrdCryptosslRSA.cc b/src/XrdCrypto/XrdCryptosslRSA.cc
@@ -361,7 +361,7 @@ int XrdCryptosslRSA::GetPublen()
    return publen;
 }
 //_____________________________________________________________________________
-int XrdCryptosslRSA::ExportPublic(char *out, int)
+int XrdCryptosslRSA::ExportPublic(char *&out, int)
 {
    // Export the public key into buffer out. The length of the buffer should be
    // at least GetPublen()+1 bytes. If out=0 the buffer is m-allocated internally
@@ -426,7 +426,7 @@ int XrdCryptosslRSA::GetPrilen()
 }
 
 //_____________________________________________________________________________
-int XrdCryptosslRSA::ExportPrivate(char *out, int)
+int XrdCryptosslRSA::ExportPrivate(char *&out, int)
 {
    // Export the private key into buffer out. The length of the buffer should be
    // at least GetPrilen()+1 bytes. If out=0 the buffer is m-allocated internally

diff --git a/src/XrdCrypto/XrdCryptosslRSA.hh b/src/XrdCrypto/XrdCryptosslRSA.hh
@@ -70,9 +70,9 @@ public:
 
    // Import / Export methods
    int ImportPublic(const char *in, int lin);
-   int ExportPublic(char *out, int lout);
+   int ExportPublic(char *&out, int lout);
    int ImportPrivate(const char *in, int lin);
-   int ExportPrivate(char *out, int lout);
+   int ExportPrivate(char *&out, int lout);
 
    // Encryption / Decryption methods
    int EncryptPrivate(const char *in, int lin, char *out, int lout);