--- samba-4.0.8/lib/util/charset/pull_push.c.orig 2012-10-02 10:24:40.000000000 +0200 +++ samba-4.0.8/lib/util/charset/pull_push.c 2013-08-27 16:59:16.071804915 +0200 @@ -38,6 +38,10 @@ bool push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src, size_t *converted_size) { + if (src == NULL) { + return (1 != 1); + } + size_t src_len = strlen(src)+1; *dest = NULL;