Changeset: e1233e6364c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1233e6364c5
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/conf/MonetDB.m4
clients/src/mapilib/Mapi.mx
Branch: default
Log Message:
Merged from Oct2010
diffs (109 lines):
diff -r be3deb8391d0 -r e1233e6364c5 buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py Fri Nov 19 10:56:44 2010 +0100
+++ b/buildtools/autogen/autogen/am.py Fri Nov 19 12:42:33 2010 +0100
@@ -356,10 +356,10 @@
fd.write(" C_script_%s = script_%s\n" % (mkname, script))
for condname in scripts['COND']:
fd.write("endif\n")
- if not os.path.exists(script):
+ if not os.path.exists(os.path.join(am['CWDRAW'], script)):
am['BUILT_SOURCES'].append("$(C_" +mkname+ ")")
am['EXTRA_DIST'].append(script)
- elif os.path.exists(script):
+ elif os.path.exists(os.path.join(am['CWDRAW'], script)):
am['EXTRA_DIST'].append(script)
else:
am['BUILT_SOURCES'].append(script)
@@ -947,6 +947,7 @@
fd.write('\tgem install --local --install-dir $(DESTDIR)%s --force
--rdoc %s\n' % (rd, f[:-4]))
fd.write('uninstall-exec-local-%s: %s\n' % (sf, f[:-4]))
fd.write('\tgem uninstall --install-dir $(DESTDIR)%s %s\n' % (rd,
f[:-4]))
+ am['BUILT_SOURCES'].append(f[:-4])
fd.write('else\n')
for f in gem['FILES']:
sf = f.replace('.', '_')
@@ -1125,6 +1126,7 @@
if cwd != topdir:
# in case we happen to be running this on Windows, replace dir seps
am['CWD'] = cwd[len(topdir)+1:].replace('\\', '/')+'/'
+ am['CWDRAW'] = cwd
am['BUILT_SOURCES'] = []
am['EXTRA_DIST'] = []
am['LIBS'] = [] # all libraries (am_libs and am_library)
diff -r be3deb8391d0 -r e1233e6364c5 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Fri Nov 19 10:56:44 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Fri Nov 19 12:42:33 2010 +0100
@@ -3044,9 +3044,9 @@
AC_CHECK_PROG(FIG2DEV,fig2dev,fig2dev)
FIG2DEV_EPS=eps
AC_MSG_CHECKING([$FIG2DEV postscript option])
-[ if [ "$FIG2DEV" ]; then
- echo "" > $FIG2DEV -L$FIG2DEV_EPS 2>/dev/null
- if [ $? -ne 0 ]; then
+[ if test "$FIG2DEV"; then
+ echo "" | $FIG2DEV -L$FIG2DEV_EPS 2>/dev/null
+ if test $? -ne 0; then
FIG2DEV_EPS=ps
fi
fi ]
@@ -3056,16 +3056,16 @@
INSTALL_BACKUP=""
AC_MSG_CHECKING([$INSTALL --backup option])
-[ if [ "$INSTALL" ]; then
+[ if test "$INSTALL"; then
inst=`echo $INSTALL | sed 's/ .*//'`
- if [ ! "`file $inst | grep 'shell script' 2>/dev/null`" ] ; then
+ if test ! "`file $inst | grep 'shell script' 2>/dev/null`" ; then
echo "" > c 2>/dev/null
$INSTALL --backup=nil c d 1>/dev/null 2>/dev/null
- if [ $? -eq 0 ]; then
+ if test $? -eq 0; then
INSTALL_BACKUP="--backup=nil"
fi
$INSTALL -C --backup=nil c e 1>/dev/null 2>/dev/null
- if [ $? -eq 0 ]; then
+ if test $? -eq 0; then
INSTALL_BACKUP="-C --backup=nil"
fi
fi
@@ -3199,7 +3199,7 @@
MEL="$withval"
fi
if test x$MEL = x; then
- if [ -z "$1" ]; then
+ if test -z "$1"; then
AC_MSG_ERROR([mel is required])
fi
have_mel=no
diff -r be3deb8391d0 -r e1233e6364c5 clients/ChangeLog.Oct2010
--- a/clients/ChangeLog.Oct2010 Fri Nov 19 10:56:44 2010 +0100
+++ b/clients/ChangeLog.Oct2010 Fri Nov 19 12:42:33 2010 +0100
@@ -1,6 +1,10 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Fri Nov 19 2010 Fabian Groffen <[email protected]>
+- Workaround usage of strncat to solve mclient/mapilib aborts from
+ bug #2725
+
* Fri Nov 12 2010 Sjoerd Mullender <[email protected]>
- Fixed a corner case in the table display code.
diff -r be3deb8391d0 -r e1233e6364c5 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Fri Nov 19 10:56:44 2010 +0100
+++ b/clients/src/mapilib/Mapi.mx Fri Nov 19 12:42:33 2010 +0100
@@ -2573,11 +2573,10 @@
if (mid->password[0] != '\1') {
unsigned char md[64]; /* should be
SHA512_DIGEST_LENGTH */
size_t n = strlen(mid->password);
- char *key = alloca(n + 1);
+ char *key = alloca(n);
int len;
- key[0] = '\0';
- strncat(key, mid->password, n);
+ strncpy(key, mid->password, n);
if (strcmp(serverhash, "RIPEMD160") == 0) {
RIPEMD160((unsigned char *) key, n, md);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
