Rev 5316: merge from upstream in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

[Michael Adam]

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

------------------------------------------------------------
revno: 5316
revision-id: ma at sernet.de-20070401214140-01fc7f4fc59cb459
parent: ma at sernet.de-20070331232431-88e5233d98a5e30f
parent: vlendec at samba.org-20070401170202-z94d06sla1xaneg8
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Sun 2007-04-01 23:41:40 +0200
message:
  merge from upstream
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  source/lib/util.c              util.c-20060530022627-d569af0e687a4dd3
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070401170202-z94d06sla1xaneg8
    parent: herb at samba.org-20070331050501-0zoaqz3ih3pcifaf
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-01 12:02:02 -0500
    message:
      vlendec at samba.org (r22019)  2007-04-01 08:50:02 -0500 (Sun, 01 Apr 2007)
          
          Jeremy, this hopefully fixes the build farm currently. But I think we need
          another get_safe_offset call that also includes the required buffer size.
          
          Volker
          
=== modified file 'REVISION'
--- a/REVISION	2007-03-31 05:05:01 +0000
+++ b/REVISION	2007-04-01 17:02:02 +0000
@@ -2,9 +2,9 @@
 URL: svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
 Repository Root: svn+ssh://svn.samba.org/home/svn/samba
 Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 22018
+Revision: 22019
 Node Kind: directory
-Last Changed Author: herb
-Last Changed Rev: 22018
-Last Changed Date: 2007-03-30 22:11:02 -0500 (Fri, 30 Mar 2007)
+Last Changed Author: vlendec
+Last Changed Rev: 22019
+Last Changed Date: 2007-04-01 08:50:02 -0500 (Sun, 01 Apr 2007)
 

=== modified file 'source/lib/util.c'
--- a/source/lib/util.c	2007-03-30 23:03:42 +0000
+++ b/source/lib/util.c	2007-04-01 17:02:02 +0000
@@ -3132,7 +3132,7 @@
 char *get_safe_offset(const char *buf_base, size_t buf_len, char *ptr, size_t off)
 {
 	const char *end_base = buf_base + buf_len;
-	const char *end_ptr = ptr + off;
+	char *end_ptr = ptr + off;
 
 	if (!buf_base || !ptr) {
 		return NULL;
@@ -3143,7 +3143,7 @@
 	}
 
 	if (end_ptr < end_base) {
-		return ptr;
+		return end_ptr;
 	}
 	return NULL;
 }