more tweaks for empty matrices

gretl-project · Dec 3, 2024 · 8212954 · 8212954
1 parent 0c35a98
commit 8212954
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/src/usermat.c b/lib/src/usermat.c
@@ -1026,6 +1026,8 @@ gretl_matrix *matrix_get_submatrix (const gretl_matrix *M,
     if (M->rows == 1 && M->cols == 1) {
         if (spec->ltype == SEL_EXCL && spec->rtype == SEL_NULL) {
             r = c = 0;
+        } else if (spec->ltype == SEL_EXCL && spec->rtype == SEL_EXCL) {
+            r = c = 0;
         } else if (spec->ltype == SEL_EXCL && spec->rtype == SEL_ALL) {
             r = 0; c = 1;
         } else if (spec->ltype == SEL_ALL && spec->rtype == SEL_EXCL) {
@@ -1042,8 +1044,8 @@ gretl_matrix *matrix_get_submatrix (const gretl_matrix *M,
 
     if (S == NULL) {
 	*err = E_ALLOC;
-    } else if (r == 0 && c == 0) {
-        /* nothing more to be done */
+    } else if (r * c == 0) {
+        /* empty matrix: nothing more to be done */
         return S;
     } else {
 	int j, mj;