Attachment 8703 Details for Bug 9727 – patch for 3.6

[patch] patch for 3.6

9727-3.6.patch (text/plain), 1.53 KB, created by Volker Lendecke on 2013-03-31 18:13:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2013-03-31 18:13:50 UTC

Size: 1.53 KB

patch

obsolete

>From 7f4700c940f3f384d4c6f7cdb47b194a9f8520aa Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 18 Mar 2013 09:36:17 +0100
>Subject: [PATCH] wkssvc: Fix bug 9727, NULL pointer dereference
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Mon Mar 18 11:39:27 CET 2013 on sn-devel-104
>(cherry picked from commit 05a7a10c88be99d864eacd6f9d37a340022f01f6)
>---
> source3/rpc_server/wkssvc/srv_wkssvc_nt.c |    8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
>index 1764941..2d3ec1e 100644
>--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
>+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
>@@ -579,7 +579,9 @@ WERROR _wkssvc_NetWkstaEnumUsers(struct pipes_struct *p,
> 		}
> 		r->out.info->level = r->in.info->level;
> 		*r->out.entries_read = r->out.info->ctr.user0->entries_read;
>-		*r->out.resume_handle = 0;
>+		if (r->out.resume_handle != NULL) {
>+			*r->out.resume_handle = 0;
>+		}
> 		break;
> 	case 1:
> 		r->out.info->ctr.user1 = create_enum_users1(p->mem_ctx);
>@@ -588,7 +590,9 @@ WERROR _wkssvc_NetWkstaEnumUsers(struct pipes_struct *p,
> 		}
> 		r->out.info->level = r->in.info->level;
> 		*r->out.entries_read = r->out.info->ctr.user1->entries_read;
>-		*r->out.resume_handle = 0;
>+		if (r->out.resume_handle != NULL) {
>+			*r->out.resume_handle = 0;
>+		}
> 		break;
> 	default:
> 		return WERR_UNKNOWN_LEVEL;
>-- 
>1.7.9.5
>

Flags:

obnox: review+

Actions: View

Attachments on bug 9727: 8655 | 8703 | 8704