svn commit: samba r14482 - branches/SAMBA_3_0/source/rpc_server
trunk/source/rpc_server
jerry at samba.org
jerry at samba.org
Thu Mar 16 16:46:25 GMT 2006
Author: jerry
Date: 2006-03-16 16:46:23 +0000 (Thu, 16 Mar 2006)
New Revision: 14482
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14482
Log:
Fixes for spoolss code (after coverity fixes) when the
client sends a NULL RPC_BUFFER*
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
trunk/source/rpc_server/srv_spoolss_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c 2006-03-16 16:02:21 UTC (rev 14481)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c 2006-03-16 16:46:23 UTC (rev 14482)
@@ -4621,7 +4621,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -4936,7 +4936,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -5535,7 +5535,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -6374,7 +6374,7 @@
{
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (q_u->offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -6589,7 +6589,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -6966,7 +6966,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -7031,7 +7031,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0) ) {
return WERR_INVALID_PARAM;
}
@@ -7144,7 +7144,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -7430,7 +7430,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -7840,7 +7840,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer ) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8452,7 +8452,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8531,7 +8531,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8659,7 +8659,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8835,7 +8835,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -9457,7 +9457,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
Modified: trunk/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- trunk/source/rpc_server/srv_spoolss_nt.c 2006-03-16 16:02:21 UTC (rev 14481)
+++ trunk/source/rpc_server/srv_spoolss_nt.c 2006-03-16 16:46:23 UTC (rev 14482)
@@ -4621,7 +4621,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -4936,7 +4936,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -5535,7 +5535,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -6374,7 +6374,7 @@
{
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (q_u->offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -6589,7 +6589,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -6966,7 +6966,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -7031,7 +7031,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0) ) {
return WERR_INVALID_PARAM;
}
@@ -7144,7 +7144,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -7430,7 +7430,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -7840,7 +7840,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer ) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8452,7 +8452,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8531,7 +8531,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8659,7 +8659,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -8835,7 +8835,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
@@ -9457,7 +9457,7 @@
/* that's an [in out] buffer */
- if (!q_u->buffer) {
+ if (!q_u->buffer && (offered!=0)) {
return WERR_INVALID_PARAM;
}
More information about the samba-cvs
mailing list