libsmb: Fix CID 1034605 Incorrect pointer comparison

[sfrench/samba-autobuild/.git] / source3 / libsmb / clistr.c

diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 3c9964368edea37899ba507e3360c268961ba5fc..f1264f65ce521fa2275ca4c3dbac9ad6688dbc83 100644 (file)
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -2,10 +2,11 @@
    Unix SMB/CIFS implementation.
    client string routines
    Copyright (C) Andrew Tridgell 2001
-   
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,30 +15,25 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
 
-int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags)
-{
-       return push_string(cli->outbuf, dest, src, dest_len, flags);
-}
-
-int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, 
-               int flags)
-{
-       return pull_string(cli->inbuf, dest, src, dest_len, src_len, flags);
-}
-
-
-int clistr_align_out(struct cli_state *cli, const void *p, int flags)
-{
-       return align_string(cli->outbuf, p, flags);
-}
-
-int clistr_align_in(struct cli_state *cli, const void *p, int flags)
+size_t clistr_pull_talloc(TALLOC_CTX *ctx,
+                         const char *base,
+                         uint16_t flags2,
+                         char **pp_dest,
+                         const void *src,
+                         int src_len,
+                         int flags)
 {
-       return align_string(cli->inbuf, p, flags);
+       return pull_string_talloc(ctx,
+                                 base,
+                                 flags2,
+                                 pp_dest,
+                                 src,
+                                 src_len,
+                                 flags);
 }