git.samba.org
/
ira
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5f75af
)
fixed a few bugs in new_smb_io_relarraystr().
author
Gerald Carter
<jerry@samba.org>
Mon, 14 Aug 2000 21:18:02 +0000
(21:18 +0000)
committer
Gerald Carter
<jerry@samba.org>
Mon, 14 Aug 2000 21:18:02 +0000
(21:18 +0000)
Marshalling code path now uses spoolss_smb_io_unistr()
also caught a NULL pointer case.
i'll update TNG later.
(This used to be commit
bd4c83eb40a14baf447ac88886d4eafe7b9a309f
)
source3/rpc_parse/parse_spoolss.c
patch
|
blob
|
history
diff --git
a/source3/rpc_parse/parse_spoolss.c
b/source3/rpc_parse/parse_spoolss.c
index 1b565cb2d90b37360b3a423bde2eb8ad974ba189..fe8e9c85cacc617e850df995a49eb95fa7364c72 100644
(file)
--- a/
source3/rpc_parse/parse_spoolss.c
+++ b/
source3/rpc_parse/parse_spoolss.c
@@
-1614,7
+1614,7
@@
static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui
}
/* write the string */
- if (!smb_io_unistr(desc, &chaine, ps, depth)) {
+ if (!s
poolss_s
mb_io_unistr(desc, &chaine, ps, depth)) {
free(chaine.buffer);
return False;
}
@@
-1669,7
+1669,10
@@
static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui
/* the end should be bould NULL terminated so add
the second one here */
- chaine2[l_chaine2] = '\0';
+ if (chaine2)
+ {
+ chaine2[l_chaine2] = '\0';
+ }
*string=chaine2;
if(!prs_set_offset(ps, old_offset))