Mercurial > mxe-octave
changeset 1365:74f410467f97
upgrade package freetds to cvs
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 16 Nov 2010 13:16:09 +0100 |
| parents | 47ac387d3228 |
| children | 4c2e54c1a378 |
| files | src/freetds-1-fastforward.patch |
| diffstat | 1 files changed, 57 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freetds-1-fastforward.patch Wed Nov 10 14:03:06 2010 +0100 +++ b/src/freetds-1-fastforward.patch Tue Nov 16 13:16:09 2010 +0100 @@ -158161,3 +158161,60 @@ } else { tdsdump_log(TDS_DBG_INFO1, "UNRECOGNIZED option '%s' ... ignoring.\n", option); } + +commit a1929b818aaa5b960319c62023bb3ac22f5cf99b +Author: freddy77 <freddy77> +Date: Tue Nov 16 10:29:56 2010 +0000 + + fix possible core (patch from Peter C. Norton) + +diff --git a/ChangeLog b/ChangeLog +index 1a87e00..cde099a 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++Tue Nov 16 11:29:37 CET 2010 Frediano Ziglio <freddy77_A_gmail_D_com> ++ * src/tds/threadsafe.c: ++ - fix possible core (patch from Peter C. Norton) ++ + Tue Nov 9 16:46:15 CET 2010 Frediano Ziglio <freddy77_A_gmail_D_com> + * include/tds.h include/tdsodbc.h src/odbc/connectparams.c: + * src/tds/challenge.c src/tds/config.c: +@@ -2996,4 +3000,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org> + * ChangeLog-0.82 added because of release + + $FreeTDS$ +-$Id: ChangeLog,v 1.3154 2010/11/09 15:46:42 freddy77 Exp $ ++$Id: ChangeLog,v 1.3155 2010/11/16 10:29:56 freddy77 Exp $ +diff --git a/src/tds/threadsafe.c b/src/tds/threadsafe.c +index 5b8e280..e76f035 100644 +--- a/src/tds/threadsafe.c ++++ b/src/tds/threadsafe.c +@@ -1,6 +1,6 @@ + /* FreeTDS - Library of routines accessing Sybase and Microsoft databases + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Brian Bruns +- * Copyright (C) 2005 Frediano Ziglio ++ * Copyright (C) 2005-2010 Frediano Ziglio + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -85,7 +85,7 @@ + #include <dmalloc.h> + #endif + +-TDS_RCSID(var, "$Id: threadsafe.c,v 1.48 2010/01/10 14:43:12 freddy77 Exp $"); ++TDS_RCSID(var, "$Id: threadsafe.c,v 1.49 2010/11/16 10:29:56 freddy77 Exp $"); + + char * + tds_timestamp_str(char *str, int maxlen) +@@ -520,7 +520,9 @@ tds_get_homedir(void) + char buf[1024]; + + # if defined(HAVE_FUNC_GETPWUID_R_5) +- if (getpwuid_r(getuid(), &bpw, buf, sizeof(buf), &pw)) ++ /* getpwuid_r can return 0 if uid is not found so check pw */ ++ pw = NULL; ++ if (getpwuid_r(getuid(), &bpw, buf, sizeof(buf), &pw) || !pw) + return NULL; + + # elif defined(HAVE_FUNC_GETPWUID_R_4_PW)