diff options
| author | Jeremy Allison <jra@samba.org> | 2012-08-08 15:35:28 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-08-09 12:06:54 -0700 |
| commit | 526e875cec15761099438e17df3f56bc2bd5b761 (patch) | |
| tree | 8ad776c58b3a25b8739b03cdaf330c295bc570b7 /source3/smbd/lanman.c | |
| parent | e1ec86a49ce1d7c3ebe99fc175ffad70a03c4a0b (diff) | |
| download | samba-526e875cec15761099438e17df3f56bc2bd5b761.tar.gz samba-526e875cec15761099438e17df3f56bc2bd5b761.tar.bz2 samba-526e875cec15761099438e17df3f56bc2bd5b761.zip | |
Check error returns from strupper_m() (in all reasonable places).
Diffstat (limited to 'source3/smbd/lanman.c')
| -rw-r--r-- | source3/smbd/lanman.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 1b5de57ad4..b22619ff35 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -4004,7 +4004,9 @@ static bool api_NetWkstaGetInfo(struct smbd_server_connection *sconn, SIVAL(p,0,PTR_DIFF(p2,*rdata)); /* host name */ strlcpy(p2,get_local_machine_name(),PTR_DIFF(endp,p2)); - strupper_m(p2); + if (!strupper_m(p2)) { + return false; + } p2 = skip_string(*rdata,*rdata_len,p2); if (!p2) { return False; @@ -4021,7 +4023,9 @@ static bool api_NetWkstaGetInfo(struct smbd_server_connection *sconn, SIVAL(p,0,PTR_DIFF(p2,*rdata)); /* login domain */ strlcpy(p2,lp_workgroup(),PTR_DIFF(endp,p2)); - strupper_m(p2); + if (!strupper_m(p2)) { + return false; + } p2 = skip_string(*rdata,*rdata_len,p2); if (!p2) { return False; @@ -4691,7 +4695,9 @@ static bool api_WWkstaUserLogon(struct smbd_server_connection *sconn, fstring mypath; fstrcpy(mypath,"\\\\"); fstrcat(mypath,get_local_machine_name()); - strupper_m(mypath); + if (!strupper_m(mypath)) { + return false; + } PACKS(&desc,"z",mypath); /* computer */ } @@ -5082,7 +5088,7 @@ static void fill_printdest_info(struct spoolss_PrinterInfo2 *info2, int uLevel, strncpy(buf, info2->printername, sizeof(buf)-1); buf[sizeof(buf)-1] = 0; - strupper_m(buf); + (void)strupper_m(buf); if (uLevel <= 1) { PACKS(desc,"B9",buf); /* szName */ |