[atari] 4.5.2 removed all mallocs for atari, fuji_appkey buffer needs to be 2 bytes larger than key

Author: markjfisher

Changelog.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [4.5.2] - 2024-08-25
+
+- [atari] fuji_read_appkey no longer uses malloc, but requires the data buffer passed in to be at least 2 bytes larger than the keysize to work.
+
 ## [4.5.1] - 2024-08-24
 
 - [atari] set dtimlo to 1 for appkey read, 2 for appkey write to reduce timeouts when reading / writing a new appkey

atari/src/fn_fuji/fuji_appkey_open_read.c

@@ -18,7 +18,6 @@ bool fuji_read_appkey(uint8_t key_id, uint16_t *count, uint8_t *data)
 	uint8_t open_data[6];
 	uint8_t mode = 0;				// READ with standard 64 byte size
 	uint16_t buffer_size = 64;		// 64 is default, gets adjusted if mode is different
-	uint8_t *buffer;  				// the malloc'd buffer to read into before copying to user's data buffer
 	uint16_t bytes_read;
 
 	if (ak_creator_id == 0) {
@@ -31,9 +30,6 @@ bool fuji_read_appkey(uint8_t key_id, uint16_t *count, uint8_t *data)
 	// 	buffer_size = 256;
 	// }
 
-	buffer = malloc(buffer_size + 2); // 2 for length bytes
-	if (!buffer) return false;
-
 	open_data[0] = ak_creator_id & 0xFF;
 	open_data[1] = ak_creator_id >> 8;
 	open_data[2] = ak_app_id;
@@ -45,27 +41,27 @@ bool fuji_read_appkey(uint8_t key_id, uint16_t *count, uint8_t *data)
 	OS.dcb.dbuf = open_data;
 	bus();
 	if (!fuji_success()) {
-		free(buffer);
 		return false;
 	}
 
 	copy_fuji_cmd_data(t_fuji_read_appkey);
-	OS.dcb.dbuf   = buffer;
+	OS.dcb.dbuf   = data;
 	OS.dcb.dbyt   = buffer_size + 2; 	// add 2 for count bytes
 	OS.dcb.dtimlo = 1;					// make timeout 1 second, as it's an SD read if it exists, if it's no there, we get a double timeout and we really don't want to wait forever
 	bus();
 	if (!fuji_success()) {
-		free(buffer);
 		return false;
 	}
 
-	bytes_read = buffer[0] + (buffer[1] << 8);
+	bytes_read = data[0] + (data[1] << 8);
 	*count = bytes_read;
 	if (bytes_read > 0) {
-		// skip the first 2 bytes, copy buffer data to user's data
-		memcpy(data, &buffer[2], bytes_read);
+		// move the data from data+2 to data, and set everything else to 0 after this. the count is returned via parameter
+		memmove(data, &data[2], bytes_read);
+		if (bytes_read < buffer_size) {
+			memset(&data[bytes_read], 0, buffer_size - bytes_read);
+		}
 	}
-	free(buffer);
 	return true;
 
 }

fujinet-fuji.h

@@ -500,17 +500,17 @@ bool fuji_unmount_disk_image(uint8_t ds);
 bool fuji_unmount_host_slot(uint8_t hs);
 
 /**
- * @brief  Opens and reads from appkey using the provided details
- * @param  key_id the specific key id of this application
- * @param  count a pointer to an int for the number of bytes that were read
- * @param  data a pointer to the memory to write the data back to.
+ * @brief  Opens and reads from appkey using the provided details. Writes to the data buffer, and sets count to the amount of data read if it is less than the full keysize.
+ * @param  key_id the specific key id of this application.
+ * @param  count a pointer to an int for the number of bytes that were read.
+ * @param  data a pointer to the memory to write the data back to. WARNING: The data buffer needs to be at least 2 more bytes larger than the keysize.
  * @return success status of the call. If either the initial OPEN or subsequent READ fail, will return false.
  */
 bool fuji_read_appkey(uint8_t key_id, uint16_t *count, uint8_t *data);
 
 /**
- * @brief  Writes to an appkey using the provided details previously setup with fuji_set_appkey_details
- * @param  key_id the specific key id of this application
+ * @brief  Writes to an appkey using the provided details previously setup with fuji_set_appkey_details.
+ * @param  key_id the specific key id of this application.
  * @param  count the number of bytes in the buffer to write to the appkey.
  * @param  data a pointer to the memory to write from.
  * @return success status of the call. If either the initial OPEN or subsequent WRITE fail, will return false.

version.txt

@@ -1 +1 @@
-4.5.1
+4.5.2