Attachment 4902 Details for Bug 6855 – Potential Patch for this issue?

[patch] Potential Patch for this issue?

patch_ads (text/plain), 1.60 KB, created by Steve Douglas (dead mail address) on 2009-10-28 17:12:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Douglas (dead mail address)

Created: 2009-10-28 17:12:05 UTC

Size: 1.60 KB

patch

obsolete

>--- filename.c	2009-07-03 05:21:14.000000000 -0600
>+++ /tmp/filename.c.new	2009-10-28 15:53:08.000000000 -0600
>@@ -938,15 +938,25 @@
> 	NTSTATUS status;
> 	unsigned int i, num_streams;
> 	struct stream_struct *streams = NULL;
>+	char * streamname_tmp = NULL;
>+
>+	streamname_tmp = talloc_asprintf(mem_ctx, "%s:%s", streamname,
>+                                                     "$DATA");
>+	if ( streamname_tmp == NULL) {
>+		status = NT_STATUS_NO_MEMORY;
>+		return (status);
>+	}
> 
> 	result = talloc_asprintf(mem_ctx, "%s%s", basepath, streamname);
> 	if (result == NULL) {
>+		TALLOC_FREE(streamname_tmp);
> 		return NT_STATUS_NO_MEMORY;
> 	}
> 
> 	if (SMB_VFS_STAT(conn, result, &st) == 0) {
> 		*pst = st;
> 		*path = result;
>+		TALLOC_FREE(streamname_tmp);
> 		return NT_STATUS_OK;
> 	}
> 
>@@ -962,6 +972,7 @@
> 	if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
> 		SET_STAT_INVALID(*pst);
> 		*path = result;
>+		TALLOC_FREE(streamname_tmp);
> 		return NT_STATUS_OK;
> 	}
> 
>@@ -971,15 +982,16 @@
> 	}
> 
> 	for (i=0; i<num_streams; i++) {
>-		DEBUG(10, ("comparing [%s] and [%s]: ",
>-			   streamname, streams[i].name));
>-		if (fname_equal(streamname, streams[i].name,
>+		DEBUG(10, ("Now comparing [%s] and [%s]: ",
>+			   streamname_tmp, streams[i].name));
>+		if (fname_equal(streamname_tmp, streams[i].name,
> 				conn->case_sensitive)) {
> 			DEBUGADD(10, ("equal\n"));
> 			break;
> 		}
> 		DEBUGADD(10, ("not equal\n"));
> 	}
>+	TALLOC_FREE(streamname_tmp);
> 
> 	if (i == num_streams) {
> 		SET_STAT_INVALID(*pst);
>@@ -1009,5 +1021,6 @@
>  fail:
> 	TALLOC_FREE(result);
> 	TALLOC_FREE(streams);
>+	TALLOC_FREE(streamname_tmp);
> 	return status;
> }

Actions: View

Attachments on bug 6855: 4902