diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-05-12 07:05:10 -0400 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-17 09:50:21 +0200 |
| commit | 8bbeccb9c35661c5a4d219398889b9f66aed7de7 (patch) | |
| tree | 288d8c96172a1e6f72fe3597918d863d5c900459 | |
| parent | 5de0ffa2e337fa650ef106d32f1be2b43d3f1544 (diff) | |
| download | samba-8bbeccb9c35661c5a4d219398889b9f66aed7de7.tar.gz | |
mount.cifs: check for NULL addr pointer before handling scopeid
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Fix bug #7315 (mount.cifs segfaults after upgrade to 2.6.33).
(cherry picked from commit 78a6eb582d28d92db5ffab6ded40785be54cf540)
| -rw-r--r-- | client/mount.cifs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mount.cifs.c b/client/mount.cifs.c index 0b8d5b400f4..1b472c2ea50 100644 --- a/client/mount.cifs.c +++ b/client/mount.cifs.c @@ -1648,7 +1648,7 @@ mount_retry: } } - if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { + if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { strlcat(options, "%", options_size); current_len = strnlen(options, options_size); optionstail = options + current_len; |