The branch, master has been updated
via 3fe974c4feed33187294a0cb922c20f7dbfeaf43 (commit)
via d03133e696aea45e0843f4d72d2d1449366ac4e2 (commit)
via fb904194c9f696b72d862e51e7ba688decdda192 (commit)
from 073e9f42f0c5f5de5d736ec7843d80a274c891ce (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3fe974c4feed33187294a0cb922c20f7dbfeaf43
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 16 12:26:46 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 d03133e696aea45e0843f4d72d2d1449366ac4e2
Merge: fb904194c9f696b72d862e51e7ba688decdda192
073e9f42f0c5f5de5d736ec7843d80a274c891ce
Author: Jeremy Allison <[email protected]>
Date: Fri Jan 16 12:25:35 2009 -0800
Merge branch 'master' of ssh://[email protected]/data/git/samba
commit fb904194c9f696b72d862e51e7ba688decdda192
Author: Jeremy Allison <[email protected]>
Date: Fri Jan 16 11:55:01 2009 -0800
"First thing, kill all the language lawyers" :-). Ensure possible insane
compilers
can't kill us later.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/lib/util_sock.c | 2 +-
source3/libsmb/libsmb_path.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index b46ff2c..98c25c1 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1889,6 +1889,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;
@@ -1941,7 +1942,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/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c
index 2c3a5f8..b0970d4 100644
--- a/source3/libsmb/libsmb_path.c
+++ b/source3/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
