PP-699: Calls to memmove() should cast third argument need as size_t,…

… not int
openpbs · Jun 7, 2017 · 08a5327 · 08a5327
1 parent 15b3646
commit 08a5327
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/cmds/qmgr.c b/src/cmds/qmgr.c
@@ -3472,7 +3472,7 @@ get_request(char **request)
 				lp++;
 			if (!EOL(*lp)) {
 				i = strlen(lp);
-				memmove(rp, lp, i); /* By using memmove() we avoid strcpy's overlapping buffer issue. */
+				memmove(rp, lp, (size_t)i); /* By using memmove() we avoid strcpy's overlapping buffer issue. */
 				empty = FALSE;	    /* Note: memmove() doesn't Null terminate; so we take care of this by */
 			}			    /* nullifying 'line', at the end of this function, by setting line[i] to '\0'. */
 			else  {

diff --git a/src/lib/Libattr/attr_fn_acl.c b/src/lib/Libattr/attr_fn_acl.c
@@ -495,7 +495,7 @@ set_allacl(struct attribute *attr, struct attribute *new, enum batch_op op, int
 						nsize = strlen(pas->as_string[i]) + 1;
 						pc = pas->as_string[i] + nsize;
 						need = pas->as_next - pc;
-						(void)memmove(pas->as_string[i], pc, (int)need);
+						(void)memmove(pas->as_string[i], pc, (size_t)need);
 						pas->as_next -= nsize;
 						/* compact pointers */
 						for (++i; i < pas->as_npointers; i++)

diff --git a/src/lib/Libattr/attr_fn_arst.c b/src/lib/Libattr/attr_fn_arst.c
@@ -493,7 +493,7 @@ set_arst(struct attribute *attr, struct attribute *new, enum batch_op op)
 						nsize = strlen(pas->as_string[i]) + 1;
 						pc = pas->as_string[i] + nsize;
 						need = pas->as_next - pc;
-						(void)memmove(pas->as_string[i], pc, (int)need);
+						(void)memmove(pas->as_string[i], pc, (size_t)need);
 						pas->as_next -= nsize;
 						/* compact pointers */
 						for (++i; i < pas->as_npointers; i++)

diff --git a/src/lib/Libtpp/tpp_transport.c b/src/lib/Libtpp/tpp_transport.c
@@ -2016,7 +2016,7 @@ add_pkts(phy_conn_t *conn)
 		count++;
 		/* coalesce before next packet to maintain alignment */
 		avl_len = avl_len - pkt_len;
-		memmove(conn->scratch.data, conn->scratch.data + pkt_len, avl_len); /* area OVERLAP - use memmove */
+		memmove(conn->scratch.data, conn->scratch.data + pkt_len, (size_t)avl_len); /* area OVERLAP - use memmove */
 		conn->scratch.pos = conn->scratch.data + avl_len;
 	}
 

diff --git a/src/server/req_quejob.c b/src/server/req_quejob.c
@@ -2006,7 +2006,7 @@ req_jobscript(struct batch_request *preq)
 	pj->ji_script = temp;
 	memmove(pj->ji_script + pj->ji_qs.ji_un.ji_newt.ji_scriptsz,
 		preq->rq_ind.rq_jobfile.rq_data,
-		preq->rq_ind.rq_jobfile.rq_size);
+		(size_t)preq->rq_ind.rq_jobfile.rq_size);
 #endif
 	pj->ji_qs.ji_un.ji_newt.ji_scriptsz += preq->rq_ind.rq_jobfile.rq_size;