Merge remote-tracking branch 'mrc0mmand/fix-buffer-overflow'

Upstream PR: https://github.com/matusmarhefka/dfuzzer/pull/13

src/dfuzzer.c

@@ -918,7 +918,7 @@ int df_get_pid(const GDBusConnection *dcon)
  */
 void df_print_process_info(int pid)
 {
-	char proc_path[20];            // "/proc/(max5chars)/[exe|cmdline]"
+	char proc_path[15+DECIMAL_STR_MAX(int)]; // "/proc/(int)/[exe|cmdline]"
 	char name[PATH_MAX];           // for storing process and package name
 	char buf[PATH_MAX + MAXLEN];   // buffer for rpm/dpkg request
 	FILE *fp;

src/dfuzzer.h

@@ -35,6 +35,16 @@
 /** Maximum length of strings containing D-Bus name, interface and object path */
 #define MAXLEN 256
 
+/* Returns the number of chars needed to format variables of the
+ * specified type as a decimal string. Adds in extra space for a
+ * negative '-' prefix (hence works correctly on signed
+ * types). Includes space for the trailing NUL. */
+#define DECIMAL_STR_MAX(type)                                           \
+        (2U+(sizeof(type) <= 1 ? 3U :                                   \
+             sizeof(type) <= 2 ? 5U :                                   \
+             sizeof(type) <= 4 ? 10U :                                  \
+             sizeof(type) <= 8 ? 20U : sizeof(int[-2*(sizeof(type) > 8)])))
+
 /** Structure containing D-Bus name, object path and interface of process. */
 struct fuzzing_target {
 	/* names on D-Bus have the most MAXLEN characters */