You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by bl...@apache.org on 2012/06/04 16:46:16 UTC
svn commit: r1345993 - /subversion/trunk/subversion/libsvn_subr/string.c
Author: blair
Date: Mon Jun 4 14:46:16 2012
New Revision: 1345993
URL: http://svn.apache.org/viewvc?rev=1345993&view=rev
Log:
Follow up to r1345883; protect macro arguments.
* subversion/libsvn_subr/string.c
(COPY_TWO_BYTES):
Wrap the two macro arguments in ().
Modified:
subversion/trunk/subversion/libsvn_subr/string.c
Modified: subversion/trunk/subversion/libsvn_subr/string.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/string.c?rev=1345993&r1=1345992&r2=1345993&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/string.c (original)
+++ subversion/trunk/subversion/libsvn_subr/string.c Mon Jun 4 14:46:16 2012
@@ -938,7 +938,7 @@ static const char decimal_table[100][4]
/* Copy the two bytes at SOURCE[0] and SOURCE[1] to DEST[0] and DEST[1] */
#define COPY_TWO_BYTES(dest,source)\
- memcpy(dest, source, 2)
+ memcpy((dest), (source), 2)
apr_size_t
svn__ui64toa(char * dest, apr_uint64_t number)
Re: svn commit: r1345993 - /subversion/trunk/subversion/libsvn_subr/string.c
Posted by Greg Stein <gs...@gmail.com>.
On Jun 4, 2012 10:46 AM, <bl...@apache.org> wrote:
>
> Author: blair
> Date: Mon Jun 4 14:46:16 2012
> New Revision: 1345993
>
> URL: http://svn.apache.org/viewvc?rev=1345993&view=rev
> Log:
> Follow up to r1345883; protect macro arguments.
>
> * subversion/libsvn_subr/string.c
> (COPY_TWO_BYTES):
> Wrap the two macro arguments in ().
>
> Modified:
> subversion/trunk/subversion/libsvn_subr/string.c
>
> Modified: subversion/trunk/subversion/libsvn_subr/string.c
> URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/string.c?rev=1345993&r1=1345992&r2=1345993&view=diff
>
==============================================================================
> --- subversion/trunk/subversion/libsvn_subr/string.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/string.c Mon Jun 4 14:46:16
2012
> @@ -938,7 +938,7 @@ static const char decimal_table[100][4]
>
> /* Copy the two bytes at SOURCE[0] and SOURCE[1] to DEST[0] and DEST[1]
*/
> #define COPY_TWO_BYTES(dest,source)\
> - memcpy(dest, source, 2)
> + memcpy((dest), (source), 2)
Actually, this is not necessary since these are args in the macro. They
cannot be comma-expression values.
Cheers,
-g