Merge branch 'dev' into il_float_cmp_tests

rizinorg · Apr 23, 2024 · 69009d0 · 69009d0
2 parents 531292b + e08ceb9
commit 69009d0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/librz/include/rz_vector.h b/librz/include/rz_vector.h
@@ -113,6 +113,9 @@ static inline void *rz_vector_head(const RzVector *vec) {
 // returns a pointer to the last element of the vector
 static inline void *rz_vector_tail(RzVector *vec) {
 	rz_return_val_if_fail(vec, NULL);
+	if (vec->len < 1) {
+		return NULL;
+	}
 	return (char *)vec->a + vec->elem_size * (vec->len - 1);
 }
 
@@ -292,12 +295,18 @@ static inline void **rz_pvector_data(RzPVector *vec) {
 // returns the first element of the vector
 static inline void *rz_pvector_head(RzPVector *vec) {
 	rz_return_val_if_fail(vec, NULL);
+	if (vec->v.len < 1) {
+		return NULL;
+	}
 	return ((void **)vec->v.a)[0];
 }
 
 // returns the last element of the vector
 static inline void *rz_pvector_tail(RzPVector *vec) {
 	rz_return_val_if_fail(vec, NULL);
+	if (vec->v.len < 1) {
+		return NULL;
+	}
 	return ((void **)vec->v.a)[vec->v.len - 1];
 }