The branch, v3-3-test has been updated
via 7dbebf3691576bce54ed5012b4c3d48570bdff01 (commit)
via 889d0dff4e4cfd4d4b4ed16ad64de303c795f879 (commit)
via 54913913be90323889b2f4dbd6a3ab75f4fa7ccd (commit)
from 2d0fd7543d0543ce59cb84db64afb99aa1f304b4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 7dbebf3691576bce54ed5012b4c3d48570bdff01
Merge: 889d0dff4e4cfd4d4b4ed16ad64de303c795f879
2d0fd7543d0543ce59cb84db64afb99aa1f304b4
Author: Jeremy Allison <[email protected]>
Date: Fri Jan 16 12:25:54 2009 -0800
Merge branch 'v3-3-test' of ssh://[email protected]/data/git/samba into
v3-3-test
commit 889d0dff4e4cfd4d4b4ed16ad64de303c795f879
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 16 12:24:58 2009 -0800
Fix a segfault if ? is there but the options are NULL. This is the case if
SMBC_parse_path is called by SMBC_stat_ctx.
commit 54913913be90323889b2f4dbd6a3ab75f4fa7ccd
Author: Jeremy Allison <[email protected]>
Date: Fri Jan 16 11:55:57 2009 -0800
"First thing, kill all the language lawyers" :-). Ensure possible insane
compilers
can't kill us later.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/lib/util_sock.c | 2 +-
source/libsmb/libsmb_path.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index a0d2326..650bd13 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -2080,6 +2080,7 @@ const char *get_mydnsfullname(void)
bool is_myname_or_ipaddr(const char *s)
{
TALLOC_CTX *ctx = talloc_tos();
+ char addr[INET6_ADDRSTRLEN];
char *name = NULL;
const char *dnsname;
char *servername = NULL;
@@ -2132,7 +2133,6 @@ bool is_myname_or_ipaddr(const char *s)
/* Use DNS to resolve the name, but only the first address */
struct sockaddr_storage ss;
if (interpret_string_addr(&ss, servername, 0)) {
- char addr[INET6_ADDRSTRLEN];
print_sockaddr(addr,
sizeof(addr),
&ss);
diff --git a/source/libsmb/libsmb_path.c b/source/libsmb/libsmb_path.c
index 2c3a5f8..b0970d4 100644
--- a/source/libsmb/libsmb_path.c
+++ b/source/libsmb/libsmb_path.c
@@ -286,7 +286,7 @@ SMBC_parse_path(TALLOC_CTX *ctx,
DEBUG(4, ("Found options '%s'", q));
/* Copy the options */
- if (*pp_options != NULL) {
+ if (pp_options && *pp_options != NULL) {
TALLOC_FREE(*pp_options);
*pp_options = talloc_strdup(ctx, q);
}
--
Samba Shared Repository
