[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d3054fb663a6a3a4689e52c10bb3094c39a3bce8 (commit)
      from  d62d17b9c0d8f40beaf4e168c08f18cd8bcda79b (commit)


- Log -----------------------------------------------------------------
commit d3054fb663a6a3a4689e52c10bb3094c39a3bce8
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Tue Dec 15 16:23:51 2015 -0600

    GH768: Minor grammar nits in CRYPTO_get_ex_new_index.pod
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/crypto/CRYPTO_get_ex_new_index.pod | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/crypto/CRYPTO_get_ex_new_index.pod b/doc/crypto/CRYPTO_get_ex_new_index.pod
index 1720a8f..e87d1a3 100644
--- a/doc/crypto/CRYPTO_get_ex_new_index.pod
+++ b/doc/crypto/CRYPTO_get_ex_new_index.pod
@@ -85,7 +85,7 @@ B<idx> parameter should be an already-created index value.
 When setting exdata, the pointer specified with a particular index is saved,
 and returned on a subsequent "get" call.  If the application is going to
 release the data, it must make sure to set a B<NULL> value at the index,
-to avoid likely double-free crash.
+to avoid likely double-free crashes.
 
 The function B<CRYPTO_free_ex_data> is used to free all exdata attached
 to a structure. The appropriate type-specific routine must be used.
@@ -124,9 +124,10 @@ for B<SSL> and B<SSL_SESSION> objects.  The B<to> and B<from> parameters
 are pointers to the destination and source B<CRYPTO_EX_DATA> structures,
 respectively.  The B<srcp> parameter is a pointer to the source exdata.
 When the dup_func() returns, the value in B<srcp> is copied to the
-destination ex_data.  If the pointer contained in B<srcp> is not modified,
-then both B<to> and B<from> will point to the same data.  The B<idx>,
-B<argl> and B<argp> parameters are as described for the other two callbacks.
+destination ex_data.  If the pointer contained in B<srcp> is not modified
+by the dup_func(), then both B<to> and B<from> will point to the same data.
+The B<idx>, B<argl> and B<argp> parameters are as described for the other
+two callbacks.
 
 =head1 RETURN VALUES