check osdp close file status (according prototype function comments)

goToMain · Jun 16, 2023 · d97c4e3 · d97c4e3
1 parent 6dc2e4a
commit d97c4e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/osdp.h b/include/osdp.h
@@ -1092,7 +1092,7 @@ struct osdp_file_ops {
 	 *
 	 * @retval 0 on success. -1 on errors.
 	 */
-	void (*close)(void *arg);
+	int (*close)(void *arg);
 };
 
 /**

diff --git a/src/osdp_file.c b/src/osdp_file.c
@@ -116,7 +116,10 @@ int osdp_file_cmd_stat_decode(struct osdp_pd *pd, uint8_t *buf, int len)
 
 	assert(f->offset <= f->size);
 	if (f->offset == f->size) { /* EOF */
-		f->ops.close(f->ops.arg);
+		if (f->ops.close(f->ops.arg) < 0) {
+			LOG_ERR("Stat_Decode: Close failed!");
+			return -1;
+		}
 		f->state = OSDP_FILE_DONE;
 		LOG_INF("Stat_Decode: File transfer complete");
 	}
@@ -224,7 +227,10 @@ int osdp_file_cmd_stat_build(struct osdp_pd *pd, uint8_t *buf, int max_len)
 
 	assert(f->offset <= f->size);
 	if (f->offset == f->size) { /* EOF */
-		f->ops.close(f->ops.arg);
+		if (f->ops.close(f->ops.arg) < 0) {
+			LOG_ERR("Stat_Build: Close failed!");
+			return -1;
+		}
 		f->state = OSDP_FILE_DONE;
 		LOG_INF("TX_Decode: File receive complete");
 	}