summaryrefslogtreecommitdiff
path: root/source4/lib/util/data_blob.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-25 08:27:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-25 08:27:06 +1000
commit9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93 (patch)
tree28d045a42a9b09b42e34b9009a6635026ff3d9c8 /source4/lib/util/data_blob.c
parent5631ebaf78fee35880aafe29578b8925c655e5f4 (diff)
parenta22b9d648553e5e7e0ee19606d9bceeb3b356241 (diff)
downloadsamba-9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93.tar.gz
samba-9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93.tar.bz2
samba-9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a555334db67527b57bc6172e3d08f65caf1e6760)
Diffstat (limited to 'source4/lib/util/data_blob.c')
-rw-r--r--source4/lib/util/data_blob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/util/data_blob.c b/source4/lib/util/data_blob.c
index b258e47bba..57b34b7ae7 100644
--- a/source4/lib/util/data_blob.c
+++ b/source4/lib/util/data_blob.c
@@ -176,7 +176,7 @@ _PUBLIC_ DATA_BLOB data_blob_string_const(const char *str)
{
DATA_BLOB blob;
blob.data = discard_const_p(uint8_t, str);
- blob.length = strlen(str);
+ blob.length = str ? strlen(str) : 0;
return blob;
}