diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2009-04-07 16:43:15 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2009-04-07 16:43:15 +0000 |
| commit | 69cc30c611f3e7039c26d467e8de532e3c53f538 (patch) | |
| tree | cfece47dbd18438f16bce70064dbad4d21f782ed /epan/emem.c | |
| parent | 6348c17c169af8fceac75703b86771fb2c7c614b (diff) | |
| download | wireshark-69cc30c611f3e7039c26d467e8de532e3c53f538.tar.gz | |
Another patch to sqelch warnings about asserts in g_strlcpy with NULL source pointer
svn path=/trunk/; revision=27985
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/emem.c b/epan/emem.c index a715ffe91a..855e0ac2a4 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -1723,8 +1723,10 @@ ep_strbuf_new(const gchar *init) { emem_strbuf_t *strbuf; strbuf = ep_strbuf_sized_new(next_size(0, init?strlen(init):0, 0), 0); - - g_strlcpy(strbuf->str, init, strbuf->alloc_len); + if (init) + g_strlcpy(strbuf->str, init, strbuf->alloc_len); + else + g_strlcpy(strbuf->str, "", strbuf->alloc_len); return strbuf; } |