matched READ_CHECKED(ctx, cont);

tomvita · Sep 22, 2020 · e0a7a9b · e0a7a9b
1 parent 0e99770
commit e0a7a9b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/server/source/noexs/exefs.nsp b/server/source/noexs/exefs.nsp
diff --git a/server/source/noexs/include/gecko.h b/server/source/noexs/include/gecko.h
@@ -12,7 +12,7 @@
 
 #define VER_MAJOR (1)
 #define VER_MINOR (1)
-#define VER_PATCH (141)
+#define VER_PATCH (142)
 
 #define GECKO_BUFFER_SIZE (2048 * 32)
 #define GECKO_BUFFER_SIZE2 (2048 * 4)

diff --git a/server/source/noexs/noexs.nso b/server/source/noexs/noexs.nso
diff --git a/server/source/noexs/noexs.nsp b/server/source/noexs/noexs.nsp
diff --git a/server/source/noexs/source/commands.cpp b/server/source/noexs/source/commands.cpp
@@ -485,7 +485,7 @@ static Result process(Gecko::Context &ctx, u64 m_start, u64 m_end) {
                             //
                             WRITE_CHECKED(ctx, count);
                             WRITE_BUFFER_CHECKED(ctx, outbuffer, count);
-                            READ_CHECKED(ctx,cont); if (!cont) {WRITE_CHECKED(ctx, 0); return USER_ABORT;}
+                            READ_CHECKED(ctx,cont); if (!cont) {WRITE_CHECKED(ctx, 0);READ_CHECKED(ctx, cont); return USER_ABORT;}
                             out_index = 0;
                         }
                     }
@@ -508,9 +508,11 @@ static Result process(Gecko::Context &ctx, u64 m_start, u64 m_end) {
         //
         WRITE_CHECKED(ctx, count);
         WRITE_BUFFER_CHECKED(ctx, outbuffer, count);
+        READ_CHECKED(ctx, cont);
         out_index = 0;
     }
     WRITE_CHECKED(ctx, 0);
+    READ_CHECKED(ctx, cont);
     return rc;
 }
 
@@ -611,11 +613,7 @@ static Result processlocal(Gecko::Context &ctx, u64 m_start, u64 m_end, u64 m_va
                             //
                             WRITE_CHECKED(ctx, count);
                             WRITE_BUFFER_CHECKED(ctx, outbuffer, count);
-                            READ_CHECKED(ctx, cont);
-                            if (!cont) {
-                                WRITE_CHECKED(ctx, 0);
-                                return USER_ABORT;
-                            }
+                            READ_CHECKED(ctx,cont); if (!cont) {WRITE_CHECKED(ctx, 0);READ_CHECKED(ctx, cont); return USER_ABORT;}
                             out_index = 0;
                         }
                     }
@@ -638,9 +636,11 @@ static Result processlocal(Gecko::Context &ctx, u64 m_start, u64 m_end, u64 m_va
         //
         WRITE_CHECKED(ctx, count);
         WRITE_BUFFER_CHECKED(ctx, outbuffer, count);
+        READ_CHECKED(ctx, cont);
         out_index = 0;
     }
     WRITE_CHECKED(ctx, 0);
+    READ_CHECKED(ctx, cont);
     return rc;
 }
 
@@ -717,11 +717,12 @@ static Result _getbookmark(Gecko::Context& ctx){
         printf("count = %d\n", count);
         WRITE_CHECKED(ctx, count);
         WRITE_BUFFER_CHECKED(ctx, outbuffer, count);
-        READ_CHECKED(ctx,cont); if (!cont) {WRITE_CHECKED(ctx, 0);fclose(g_memdumpFile); return USER_ABORT;}
+        READ_CHECKED(ctx,cont); if (!cont) {WRITE_CHECKED(ctx, 0);READ_CHECKED(ctx, cont);fclose(g_memdumpFile); return USER_ABORT;}
         index += len;
         size -= len;
     }
     WRITE_CHECKED(ctx, 0);
+    READ_CHECKED(ctx, cont);
     fclose(g_memdumpFile);
     return 0;
 }