Merge pull request sysprog21#303 from visitorckw/fix-syscall-error-ha…

…ndling Fix syscall error handling
qwe661234 · Dec 22, 2023 · c32861a · c32861a
2 parents 81912c1 + 331e7c4
commit c32861a
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/syscall.c b/src/syscall.c
@@ -96,8 +96,10 @@ static void syscall_write(riscv_t *rv)
         memory_read(s->mem, tmp, buffer + total_write, PREALLOC_SIZE);
         if (!map_at_end(s->fd_map, &it)) {
             /* write out the data */
-            size_t written =
-                fwrite(tmp, 1, PREALLOC_SIZE, map_iter_value(&it, FILE *));
+            FILE *handle = map_iter_value(&it, FILE *);
+            size_t written = fwrite(tmp, 1, PREALLOC_SIZE, handle);
+            if (written != PREALLOC_SIZE && ferror(handle))
+                goto error_handler;
             total_write += written;
             count -= PREALLOC_SIZE;
         } else
@@ -106,7 +108,10 @@ static void syscall_write(riscv_t *rv)
     memory_read(s->mem, tmp, buffer + total_write, count);
     if (!map_at_end(s->fd_map, &it)) {
         /* write out the data */
-        size_t written = fwrite(tmp, 1, count, map_iter_value(&it, FILE *));
+        FILE *handle = map_iter_value(&it, FILE *);
+        size_t written = fwrite(tmp, 1, count, handle);
+        if (written != count && ferror(handle))
+            goto error_handler;
         total_write += written;
     } else
         goto error_handler;
@@ -211,7 +216,11 @@ static void syscall_close(riscv_t *rv)
         map_iter_t it;
         map_find(s->fd_map, &it, &fd);
         if (!map_at_end(s->fd_map, &it)) {
-            fclose(map_iter_value(&it, FILE *));
+            if (fclose(map_iter_value(&it, FILE *))) {
+                /* error */
+                rv_set_reg(rv, rv_reg_a0, -1);
+                return;
+            }
             map_erase(s->fd_map, &it);
 
             /* success */