projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3029 from lambdageek/dev/simplify-monoerror-threads
[mono.git]
/
mono
/
metadata
/
mono-config.c
diff --git
a/mono/metadata/mono-config.c
b/mono/metadata/mono-config.c
index e9aab32a48d4484e8de91a09909d2772561e6fc2..80261f2b62e9a3d74741b48af5aff8fb135903b9 100644
(file)
--- a/
mono/metadata/mono-config.c
+++ b/
mono/metadata/mono-config.c
@@
-7,6
+7,7
@@
*
* Copyright 2002-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2009 Novell, Inc (http://www.novell.com)
*
* Copyright 2002-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2009 Novell, Inc (http://www.novell.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
*/
#include "config.h"
#include <glib.h>
*/
#include "config.h"
#include <glib.h>
@@
-285,8
+286,8
@@
dllmap_start (gpointer user_data,
char *result;
result = (char *)g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1);
char *result;
result = (char *)g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1);
- strncpy (result, attribute_
nam
es[i], p-attribute_values[i]);
- strc
at (result
, libdir);
+ strncpy (result, attribute_
valu
es[i], p-attribute_values[i]);
+ strc
py (result+(p-attribute_values[i])
, libdir);
strcat (result, p+strlen("$mono_libdir"));
info->target = result;
} else
strcat (result, p+strlen("$mono_libdir"));
info->target = result;
} else