GitList

Browse code

gen_path will no longer silently truncate the generated filename at 256 bytes.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3076 e7ae566f-a301-0410-adde-c780ea21d3b5

james authored on 2008/07/18 09:55:59
Showing 2 changed files

init.c index 05d8cd7..218fae1 100644
misc.c index 97e8049..901e8cb 100644

@@ -439,6 +439,19 @@ init_static (void)
                        return false;
                      #endif
                     +#if 0
                     +  {
                     +    struct gc_arena gc = gc_new ();
                     +    const char *fn = gen_path ("foo",
                     +			       "bar",
                     +			       &gc);
                     +    printf ("%s\n", fn);
                     +    gc_free (&gc);
                     +  }
+                    +
                     +  return false;
                     +#endif
+                    +
                        return true;
+                     }

misc.c

History View file @ ddad0a8

@@ -1129,7 +1129,8 @@ gen_path (const char *directory, const char *filename, struct gc_arena *gc)
 #endif
       )
     {
-      struct buffer out = alloc_buf_gc (256, gc);
+      const size_t outsize = strlen(safe_filename) + (directory ? strlen (directory) : 0) + 16;
+      struct buffer out = alloc_buf_gc (outsize, gc);
       char dirsep[2];
 
       dirsep[0] = OS_SPECIFIC_DIRSEP;

...	...	@@ -1129,7 +1129,8 @@ gen_path (const char directory, const char filename, struct gc_arena *gc)
1129	1129	#endif
1130	1130	)
1131	1131	{
1132		- struct buffer out = alloc_buf_gc (256, gc);
	1132	+ const size_t outsize = strlen(safe_filename) + (directory ? strlen (directory) : 0) + 16;
	1133	+ struct buffer out = alloc_buf_gc (outsize, gc);
1133	1134	char dirsep[2];
1134	1135
1135	1136	dirsep[0] = OS_SPECIFIC_DIRSEP;