Merge branch 'master' into openslx

1 files changed, 21 insertions, 4 deletions

diff --git a/src/core/image.c b/src/core/image.c
index 9fe77c54c..ce8cf868b 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -176,14 +176,13 @@ int image_set_cmdline ( struct image *image, const char *cmdline ) {
 }
 
 /**
- * Set image data
+ * Set image length
  *
  * @v image		Image
- * @v data		Image data
  * @v len		Length of image data
  * @ret rc		Return status code
  */
-int image_set_data ( struct image *image, userptr_t data, size_t len ) {
+int image_set_len ( struct image *image, size_t len ) {
 	userptr_t new;
 
 	/* (Re)allocate image data */
@@ -191,10 +190,28 @@ int image_set_data ( struct image *image, userptr_t data, size_t len ) {
 	if ( ! new )
 		return -ENOMEM;
 	image->data = new;
+	image->len = len;
+
+	return 0;
+}
+
+/**
+ * Set image data
+ *
+ * @v image		Image
+ * @v data		Image data
+ * @v len		Length of image data
+ * @ret rc		Return status code
+ */
+int image_set_data ( struct image *image, userptr_t data, size_t len ) {
+	int rc;
+
+	/* Set image length */
+	if ( ( rc = image_set_len ( image, len ) ) != 0 )
+		return rc;
 
 	/* Copy in new image data */
 	memcpy_user ( image->data, 0, data, 0, len );
-	image->len = len;
 
 	return 0;
 }