Code

amqp: use the right buffer size for sstrncpy
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 28 Nov 2015 17:48:20 +0000 (18:48 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 30 Nov 2015 21:55:35 +0000 (22:55 +0100)
buffer is a char *, not an array, so size_of returns the size
of the pointer.

src/amqp.c

index bf0f80f58498867db94f5d4534e343aba3eec001..1e23a563daccc430e3c6cda5331e5e3f9d2b9406 100644 (file)
@@ -194,11 +194,11 @@ static char *camqp_strerror (camqp_config_t *conf, /* {{{ */
     switch (r.reply_type)
     {
         case AMQP_RESPONSE_NORMAL:
-            sstrncpy (buffer, "Success", sizeof (buffer));
+            sstrncpy (buffer, "Success", buffer_size);
             break;
 
         case AMQP_RESPONSE_NONE:
-            sstrncpy (buffer, "Missing RPC reply type", sizeof (buffer));
+            sstrncpy (buffer, "Missing RPC reply type", buffer_size);
             break;
 
         case AMQP_RESPONSE_LIBRARY_EXCEPTION:
@@ -210,7 +210,7 @@ static char *camqp_strerror (camqp_config_t *conf, /* {{{ */
                 return (sstrerror (r.library_error, buffer, buffer_size));
 #endif
             else
-                sstrncpy (buffer, "End of stream", sizeof (buffer));
+                sstrncpy (buffer, "End of stream", buffer_size);
             break;
 
         case AMQP_RESPONSE_SERVER_EXCEPTION: