Changeset 7dcefa7 in libguac

Timestamp:

08/23/12 14:50:06 (9 months ago)

Author:

zhangmaike

Branches:

master, debian, rpm, unstable

Children:

f6cc43c

Parents:

9de0d0d

git-author:

Michael Jumper <zhangmaike@…> (08/23/12 14:50:06)

git-committer:

Michael Jumper <zhangmaike@…> (08/23/12 14:50:06)

Message:

Define library prefix/suffix with macros, explicitly define and enforce limit on protocol name length, and overall library name length.

Files:

• include/client.h (modified) (1 diff)
• src/client.c (modified) (2 diffs)

include/client.h

@@ -51 +51 @@
  */
 
+/**
+ * String prefix which begins the library filename of all client plugins.
+ */
+#define GUAC_PROTOCOL_LIBRARY_PREFIX "libguac-client-"
+
+/**
+ * String suffix which ends the library filename of all client plugins.
+ */
+#define GUAC_PROTOCOL_LIBRARY_SUFFIX ".so"
+
+/**
+ * The maximum number of characters (COUNTING NULL TERMINATOR) to allow
+ * for protocol names within the library filename of client plugins.
+ */
+#define GUAC_PROTOCOL_NAME_LIMIT 256
+
+/**
+ * The maximum number of characters (INCLUDING NULL TERMINATOR) that a
+ * character array containing the concatenation of the library prefix,
+ * protocol name, and suffix can contain, assuming the protocol name is
+ * limited to GUAC_PROTOCOL_NAME_LIMIT characters.
+ */
+#define GUAC_PROTOCOL_LIBRARY_LIMIT (                                  \
+                                                                       \
+      sizeof(GUAC_PROTOCOL_LIBRARY_PREFIX) - 1 /* "libguac-client-" */ \
+    +        GUAC_PROTOCOL_NAME_LIMIT      - 1 /* [up to 256 chars] */ \
+    + sizeof(GUAC_PROTOCOL_LIBRARY_SUFFIX) - 1 /* ".so"             */ \
+    + 1                                        /* NULL terminator   */ \
+                                                                       \
+)
+
+
 typedef struct guac_client guac_client;
 typedef struct guac_client_plugin guac_client_plugin;

src/client.c

@@ -165 +165 @@
 
     /* Pluggable client */
-    char protocol_lib[256] = "libguac-client-";
-    
+    char protocol_lib[GUAC_PROTOCOL_LIBRARY_LIMIT] =
+        GUAC_PROTOCOL_LIBRARY_PREFIX;
+ 
     union {
         guac_client_init_handler* client_init;
@@ -173 +174 @@
 
     /* Add protocol and .so suffix to protocol_lib */
-    strcat(protocol_lib, protocol);
-    strcat(protocol_lib, ".so");
+    strncat(protocol_lib, protocol, GUAC_PROTOCOL_NAME_LIMIT-1);
+    strcat(protocol_lib, GUAC_PROTOCOL_LIBRARY_SUFFIX);
 
     /* Load client plugin */