base: tighten swizzle_ycck preconditions

When synthesizing three (YCbCr) or four (YCbCrK, YCbCrA, etc) source
inputs, wuffs_base__pixel_swizzler__swizzle_ycck is now stricter on the
input shapes (slice length, width, height, stride, etc) being consistent
with each other.

When coming through std/jpeg or std/webp, the arguments to such calls
were consistent, but it was possible to be inconsistent when calling
wuffs_base__pixel_swizzler__swizzle_ycck directly.

As for the test case in PR #185, the behavior (prior to this commit) was
that "wuffs_base__color_u32_argb_premul have = etc" would produce
0xFFAD5EB9 (meaning an out-of-bounds read on the src_array1 slice). The
pull request proposed changing that to producing 0xFF808080, but this
commit instead changes it to produce a "#base: bad argument" error.

Updates #185
diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c
index 10a0eea..263b3a7 100644
--- a/internal/cgen/base/pixconv-submodule-ycck.c
+++ b/internal/cgen/base/pixconv-submodule-ycck.c
@@ -90,19 +90,6 @@
       wuffs_base__u32__max(c, d));
 }
 
-static inline uint32_t  //
-wuffs_private_impl__u32__min_of_5(uint32_t a,
-                                  uint32_t b,
-                                  uint32_t c,
-                                  uint32_t d,
-                                  uint32_t e) {
-  return wuffs_base__u32__min(          //
-      wuffs_base__u32__min(             //
-          wuffs_base__u32__min(a, b),   //
-          wuffs_base__u32__min(c, d)),  //
-      e);
-}
-
 // --------
 
 typedef void (*wuffs_private_impl__swizzle_ycc__convert_4_func)(
@@ -1393,20 +1380,18 @@
 // --------
 
 // wuffs_private_impl__swizzle_flattened_length is like
-// wuffs_base__table__flattened_length but returns uint64_t (not size_t) and
-// also accounts for subsampling.
-static uint64_t  //
+// wuffs_base__table__flattened_length but returns uint64_t (not size_t).
+static inline uint64_t  //
 wuffs_private_impl__swizzle_flattened_length(uint32_t width,
                                              uint32_t height,
-                                             uint32_t stride,
-                                             uint32_t inv_h,
-                                             uint32_t inv_v) {
-  uint64_t scaled_width = (((uint64_t)width) + (inv_h - 1u)) / inv_h;
-  uint64_t scaled_height = (((uint64_t)height) + (inv_v - 1u)) / inv_v;
-  if (scaled_height <= 0u) {
-    return 0u;
+                                             uint32_t stride) {
+  if (height == 0) {
+    return 0;
   }
-  return ((scaled_height - 1u) * stride) + scaled_width;
+  uint64_t w = width;
+  uint64_t h = height;
+  uint64_t s = stride;
+  return ((h - 1) * s) + w;
 }
 
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
@@ -1447,24 +1432,39 @@
     wuffs_base__slice_u8 scratch_buffer_2k) {
   if (!p) {
     return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  } else if (!dst ||                             //
-             (x_min_incl > x_max_excl) ||        //
-             (x_max_excl > 0xFFFFu) ||           //
-             (y_min_incl > y_max_excl) ||        //
-             (y_max_excl > 0xFFFFu) ||           //
-             (4u <= ((unsigned int)h0 - 1u)) ||  //
-             (4u <= ((unsigned int)h1 - 1u)) ||  //
-             (4u <= ((unsigned int)h2 - 1u)) ||  //
-             (4u <= ((unsigned int)v0 - 1u)) ||  //
-             (4u <= ((unsigned int)v1 - 1u)) ||  //
-             (4u <= ((unsigned int)v2 - 1u)) ||  //
+  } else if (!dst ||                                                    //
+             (x_max_excl > 0xFFFFu) ||                                  //
+             (y_max_excl > 0xFFFFu) ||                                  //
+             (width0 > 0x10000u) ||                                     //
+             (width1 > 0x10000u) ||                                     //
+             (width2 > 0x10000u) ||                                     //
+             (width3 > 0x10000u) ||                                     //
+             (height0 > 0x10000u) ||                                    //
+             (height1 > 0x10000u) ||                                    //
+             (height2 > 0x10000u) ||                                    //
+             (height3 > 0x10000u) ||                                    //
+             (src0.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width0, height0, stride0)) ||              //
+             (src1.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width1, height1, stride1)) ||              //
+             (src2.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width2, height2, stride2)) ||              //
+             (src3.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width3, height3, stride3)) ||              //
+             (4u <= ((unsigned int)h0 - 1u)) ||                         //
+             (4u <= ((unsigned int)h1 - 1u)) ||                         //
+             (4u <= ((unsigned int)h2 - 1u)) ||                         //
+             (4u <= ((unsigned int)v0 - 1u)) ||                         //
+             (4u <= ((unsigned int)v1 - 1u)) ||                         //
+             (4u <= ((unsigned int)v2 - 1u)) ||                         //
              ((ycc_upsampling != 0) && ((x_min_incl | y_min_incl) > 0u)) ||
              (scratch_buffer_2k.len < 2048u)) {
     return wuffs_base__make_status(wuffs_base__error__bad_argument);
   }
   if ((h3 != 0u) || (v3 != 0u)) {
     if ((4u <= ((unsigned int)h3 - 1u)) ||  //
-        (4u <= ((unsigned int)v3 - 1u))) {
+        (4u <= ((unsigned int)v3 - 1u)) ||  //
+        ((h3 * v3) == 0u)) {
       return wuffs_base__make_status(wuffs_base__error__bad_argument);
     }
   }
@@ -1485,6 +1485,41 @@
   uint32_t inv_v2 = max_incl_v / v2;
   uint32_t inv_v3 = v3 ? (max_incl_v / v3) : 0u;
 
+  if (((h0 * inv_h0) != max_incl_h) ||                  //
+      ((h1 * inv_h1) != max_incl_h) ||                  //
+      ((h2 * inv_h2) != max_incl_h) ||                  //
+      ((v0 * inv_v0) != max_incl_v) ||                  //
+      ((v1 * inv_v1) != max_incl_v) ||                  //
+      ((v2 * inv_v2) != max_incl_v) ||                  //
+      ((h3 != 0u) && ((h3 * inv_h3) != max_incl_h)) ||  //
+      ((v3 != 0u) && ((v3 * inv_v3) != max_incl_v))) {
+    return wuffs_base__make_status(wuffs_base__error__bad_argument);
+  }
+
+  if ((x_min_incl >= x_max_excl) || (y_min_incl >= y_max_excl)) {
+    return wuffs_base__make_status(NULL);
+  }
+  uint32_t dx = x_max_excl - x_min_incl;
+  uint32_t dy = y_max_excl - y_min_incl;
+
+  uint32_t expanded_width = width0 * inv_h0;
+  uint32_t expanded_height = height0 * inv_v0;
+  if ((expanded_width < dx) || (expanded_height < dy) ||  //
+      (expanded_width != (width1 * inv_h1)) ||            //
+      (expanded_width != (width2 * inv_h2)) ||            //
+      (expanded_height != (height1 * inv_v1)) ||          //
+      (expanded_height != (height2 * inv_v2))) {
+    return wuffs_base__make_status(wuffs_base__error__bad_argument);
+  } else if ((inv_h3 * inv_v3) == 0u) {
+    // No-op. The fourth channel is optional.
+  } else if (((inv_h3 * inv_v3) == 1u) && (dx == width3) && (dy == height3)) {
+    // No-op. Lossy WebP's alpha channel can have a smaller width and height
+    // than expanded_width and expanded_height.
+  } else if (((width3 * inv_h3) != expanded_width) ||
+             ((height3 * inv_v3) != expanded_height)) {
+    return wuffs_base__make_status(wuffs_base__error__bad_argument);
+  }
+
   if (x_min_incl != 0) {
     if ((x_min_incl % inv_h0) || (x_min_incl % inv_h1) ||
         (x_min_incl % inv_h2) || (inv_h3 && (x_min_incl % inv_h3))) {
@@ -1526,51 +1561,13 @@
     half_height_for_2to1 = wuffs_base__u32__min(half_height_for_2to1, height3);
   }
 
-  x_max_excl = wuffs_base__u32__min(                   //
-      wuffs_base__pixel_config__width(&dst->pixcfg),   //
-      x_min_incl + wuffs_private_impl__u32__min_of_5(  //
-                       x_max_excl - x_min_incl,        //
-                       width0 * inv_h0,                //
-                       width1 * inv_h1,                //
-                       width2 * inv_h2,                //
-                       inv_h3 ? (width3 * inv_h3) : 0xFFFFFFFF));
-  y_max_excl = wuffs_base__u32__min(                   //
-      wuffs_base__pixel_config__height(&dst->pixcfg),  //
-      y_min_incl + wuffs_private_impl__u32__min_of_5(  //
-                       y_max_excl - y_min_incl,        //
-                       height0 * inv_v0,               //
-                       height1 * inv_v1,               //
-                       height2 * inv_v2,               //
-                       inv_v3 ? (height3 * inv_v3) : 0xFFFFFFFF));
-
+  x_max_excl = wuffs_base__u32__min(
+      x_max_excl, wuffs_base__pixel_config__width(&dst->pixcfg));
+  y_max_excl = wuffs_base__u32__min(
+      y_max_excl, wuffs_base__pixel_config__height(&dst->pixcfg));
   if ((x_min_incl >= x_max_excl) || (y_min_incl >= y_max_excl)) {
     return wuffs_base__make_status(NULL);
   }
-  uint32_t width = x_max_excl - x_min_incl;
-  uint32_t height = y_max_excl - y_min_incl;
-
-  if (((h0 * inv_h0) != max_incl_h) ||  //
-      ((h1 * inv_h1) != max_incl_h) ||  //
-      ((h2 * inv_h2) != max_incl_h) ||  //
-      ((v0 * inv_v0) != max_incl_v) ||  //
-      ((v1 * inv_v1) != max_incl_v) ||  //
-      ((v2 * inv_v2) != max_incl_v) ||  //
-      (src0.len < wuffs_private_impl__swizzle_flattened_length(
-                      width, height, stride0, inv_h0, inv_v0)) ||
-      (src1.len < wuffs_private_impl__swizzle_flattened_length(
-                      width, height, stride1, inv_h1, inv_v1)) ||
-      (src2.len < wuffs_private_impl__swizzle_flattened_length(
-                      width, height, stride2, inv_h2, inv_v2))) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((h3 != 0u) || (v3 != 0u)) {
-    if (((h3 * inv_h3) != max_incl_h) ||  //
-        ((v3 * inv_v3) != max_incl_v) ||  //
-        (src3.len < wuffs_private_impl__swizzle_flattened_length(
-                        width, height, stride3, inv_h3, inv_v3))) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-  }
 
   if (wuffs_base__pixel_format__is_planar(&dst->pixcfg.private_impl.pixfmt)) {
     // TODO: see wuffs_base__pixel_buffer__set_color_u32_argb_premul_at's TODO.
diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
index 7376a8a..798ba02 100644
--- a/release/c/wuffs-unsupported-snapshot.c
+++ b/release/c/wuffs-unsupported-snapshot.c
@@ -33071,19 +33071,6 @@
       wuffs_base__u32__max(c, d));
 }
 
-static inline uint32_t  //
-wuffs_private_impl__u32__min_of_5(uint32_t a,
-                                  uint32_t b,
-                                  uint32_t c,
-                                  uint32_t d,
-                                  uint32_t e) {
-  return wuffs_base__u32__min(          //
-      wuffs_base__u32__min(             //
-          wuffs_base__u32__min(a, b),   //
-          wuffs_base__u32__min(c, d)),  //
-      e);
-}
-
 // --------
 
 typedef void (*wuffs_private_impl__swizzle_ycc__convert_4_func)(
@@ -34374,20 +34361,18 @@
 // --------
 
 // wuffs_private_impl__swizzle_flattened_length is like
-// wuffs_base__table__flattened_length but returns uint64_t (not size_t) and
-// also accounts for subsampling.
-static uint64_t  //
+// wuffs_base__table__flattened_length but returns uint64_t (not size_t).
+static inline uint64_t  //
 wuffs_private_impl__swizzle_flattened_length(uint32_t width,
                                              uint32_t height,
-                                             uint32_t stride,
-                                             uint32_t inv_h,
-                                             uint32_t inv_v) {
-  uint64_t scaled_width = (((uint64_t)width) + (inv_h - 1u)) / inv_h;
-  uint64_t scaled_height = (((uint64_t)height) + (inv_v - 1u)) / inv_v;
-  if (scaled_height <= 0u) {
-    return 0u;
+                                             uint32_t stride) {
+  if (height == 0) {
+    return 0;
   }
-  return ((scaled_height - 1u) * stride) + scaled_width;
+  uint64_t w = width;
+  uint64_t h = height;
+  uint64_t s = stride;
+  return ((h - 1) * s) + w;
 }
 
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
@@ -34428,24 +34413,39 @@
     wuffs_base__slice_u8 scratch_buffer_2k) {
   if (!p) {
     return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  } else if (!dst ||                             //
-             (x_min_incl > x_max_excl) ||        //
-             (x_max_excl > 0xFFFFu) ||           //
-             (y_min_incl > y_max_excl) ||        //
-             (y_max_excl > 0xFFFFu) ||           //
-             (4u <= ((unsigned int)h0 - 1u)) ||  //
-             (4u <= ((unsigned int)h1 - 1u)) ||  //
-             (4u <= ((unsigned int)h2 - 1u)) ||  //
-             (4u <= ((unsigned int)v0 - 1u)) ||  //
-             (4u <= ((unsigned int)v1 - 1u)) ||  //
-             (4u <= ((unsigned int)v2 - 1u)) ||  //
+  } else if (!dst ||                                                    //
+             (x_max_excl > 0xFFFFu) ||                                  //
+             (y_max_excl > 0xFFFFu) ||                                  //
+             (width0 > 0x10000u) ||                                     //
+             (width1 > 0x10000u) ||                                     //
+             (width2 > 0x10000u) ||                                     //
+             (width3 > 0x10000u) ||                                     //
+             (height0 > 0x10000u) ||                                    //
+             (height1 > 0x10000u) ||                                    //
+             (height2 > 0x10000u) ||                                    //
+             (height3 > 0x10000u) ||                                    //
+             (src0.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width0, height0, stride0)) ||              //
+             (src1.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width1, height1, stride1)) ||              //
+             (src2.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width2, height2, stride2)) ||              //
+             (src3.len < wuffs_private_impl__swizzle_flattened_length(  //
+                             width3, height3, stride3)) ||              //
+             (4u <= ((unsigned int)h0 - 1u)) ||                         //
+             (4u <= ((unsigned int)h1 - 1u)) ||                         //
+             (4u <= ((unsigned int)h2 - 1u)) ||                         //
+             (4u <= ((unsigned int)v0 - 1u)) ||                         //
+             (4u <= ((unsigned int)v1 - 1u)) ||                         //
+             (4u <= ((unsigned int)v2 - 1u)) ||                         //
              ((ycc_upsampling != 0) && ((x_min_incl | y_min_incl) > 0u)) ||
              (scratch_buffer_2k.len < 2048u)) {
     return wuffs_base__make_status(wuffs_base__error__bad_argument);
   }
   if ((h3 != 0u) || (v3 != 0u)) {
     if ((4u <= ((unsigned int)h3 - 1u)) ||  //
-        (4u <= ((unsigned int)v3 - 1u))) {
+        (4u <= ((unsigned int)v3 - 1u)) ||  //
+        ((h3 * v3) == 0u)) {
       return wuffs_base__make_status(wuffs_base__error__bad_argument);
     }
   }
@@ -34466,6 +34466,41 @@
   uint32_t inv_v2 = max_incl_v / v2;
   uint32_t inv_v3 = v3 ? (max_incl_v / v3) : 0u;
 
+  if (((h0 * inv_h0) != max_incl_h) ||                  //
+      ((h1 * inv_h1) != max_incl_h) ||                  //
+      ((h2 * inv_h2) != max_incl_h) ||                  //
+      ((v0 * inv_v0) != max_incl_v) ||                  //
+      ((v1 * inv_v1) != max_incl_v) ||                  //
+      ((v2 * inv_v2) != max_incl_v) ||                  //
+      ((h3 != 0u) && ((h3 * inv_h3) != max_incl_h)) ||  //
+      ((v3 != 0u) && ((v3 * inv_v3) != max_incl_v))) {
+    return wuffs_base__make_status(wuffs_base__error__bad_argument);
+  }
+
+  if ((x_min_incl >= x_max_excl) || (y_min_incl >= y_max_excl)) {
+    return wuffs_base__make_status(NULL);
+  }
+  uint32_t dx = x_max_excl - x_min_incl;
+  uint32_t dy = y_max_excl - y_min_incl;
+
+  uint32_t expanded_width = width0 * inv_h0;
+  uint32_t expanded_height = height0 * inv_v0;
+  if ((expanded_width < dx) || (expanded_height < dy) ||  //
+      (expanded_width != (width1 * inv_h1)) ||            //
+      (expanded_width != (width2 * inv_h2)) ||            //
+      (expanded_height != (height1 * inv_v1)) ||          //
+      (expanded_height != (height2 * inv_v2))) {
+    return wuffs_base__make_status(wuffs_base__error__bad_argument);
+  } else if ((inv_h3 * inv_v3) == 0u) {
+    // No-op. The fourth channel is optional.
+  } else if (((inv_h3 * inv_v3) == 1u) && (dx == width3) && (dy == height3)) {
+    // No-op. Lossy WebP's alpha channel can have a smaller width and height
+    // than expanded_width and expanded_height.
+  } else if (((width3 * inv_h3) != expanded_width) ||
+             ((height3 * inv_v3) != expanded_height)) {
+    return wuffs_base__make_status(wuffs_base__error__bad_argument);
+  }
+
   if (x_min_incl != 0) {
     if ((x_min_incl % inv_h0) || (x_min_incl % inv_h1) ||
         (x_min_incl % inv_h2) || (inv_h3 && (x_min_incl % inv_h3))) {
@@ -34507,51 +34542,13 @@
     half_height_for_2to1 = wuffs_base__u32__min(half_height_for_2to1, height3);
   }
 
-  x_max_excl = wuffs_base__u32__min(                   //
-      wuffs_base__pixel_config__width(&dst->pixcfg),   //
-      x_min_incl + wuffs_private_impl__u32__min_of_5(  //
-                       x_max_excl - x_min_incl,        //
-                       width0 * inv_h0,                //
-                       width1 * inv_h1,                //
-                       width2 * inv_h2,                //
-                       inv_h3 ? (width3 * inv_h3) : 0xFFFFFFFF));
-  y_max_excl = wuffs_base__u32__min(                   //
-      wuffs_base__pixel_config__height(&dst->pixcfg),  //
-      y_min_incl + wuffs_private_impl__u32__min_of_5(  //
-                       y_max_excl - y_min_incl,        //
-                       height0 * inv_v0,               //
-                       height1 * inv_v1,               //
-                       height2 * inv_v2,               //
-                       inv_v3 ? (height3 * inv_v3) : 0xFFFFFFFF));
-
+  x_max_excl = wuffs_base__u32__min(
+      x_max_excl, wuffs_base__pixel_config__width(&dst->pixcfg));
+  y_max_excl = wuffs_base__u32__min(
+      y_max_excl, wuffs_base__pixel_config__height(&dst->pixcfg));
   if ((x_min_incl >= x_max_excl) || (y_min_incl >= y_max_excl)) {
     return wuffs_base__make_status(NULL);
   }
-  uint32_t width = x_max_excl - x_min_incl;
-  uint32_t height = y_max_excl - y_min_incl;
-
-  if (((h0 * inv_h0) != max_incl_h) ||  //
-      ((h1 * inv_h1) != max_incl_h) ||  //
-      ((h2 * inv_h2) != max_incl_h) ||  //
-      ((v0 * inv_v0) != max_incl_v) ||  //
-      ((v1 * inv_v1) != max_incl_v) ||  //
-      ((v2 * inv_v2) != max_incl_v) ||  //
-      (src0.len < wuffs_private_impl__swizzle_flattened_length(
-                      width, height, stride0, inv_h0, inv_v0)) ||
-      (src1.len < wuffs_private_impl__swizzle_flattened_length(
-                      width, height, stride1, inv_h1, inv_v1)) ||
-      (src2.len < wuffs_private_impl__swizzle_flattened_length(
-                      width, height, stride2, inv_h2, inv_v2))) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((h3 != 0u) || (v3 != 0u)) {
-    if (((h3 * inv_h3) != max_incl_h) ||  //
-        ((v3 * inv_v3) != max_incl_v) ||  //
-        (src3.len < wuffs_private_impl__swizzle_flattened_length(
-                        width, height, stride3, inv_h3, inv_v3))) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-  }
 
   if (wuffs_base__pixel_format__is_planar(&dst->pixcfg.private_impl.pixfmt)) {
     // TODO: see wuffs_base__pixel_buffer__set_color_u32_argb_premul_at's TODO.
diff --git a/test/c/std/wbmp.c b/test/c/std/wbmp.c
index 1465388..9e664d8 100644
--- a/test/c/std/wbmp.c
+++ b/test/c/std/wbmp.c
@@ -631,27 +631,6 @@
           want &= 0xFFFFFFFF00000000;
         }
 
-        // These overrides should be removed.
-        //
-        // They exercise wuffs_base__pixel_swizzler__swizzle_ycck code paths
-        // (where things like src_chroma_len and src_chroma_width disagree)
-        // that aren't covered normally, by std/jpeg or std/webp. They are
-        // arguably bugs, whether that the swizzle_ycck implementation isn't
-        // sufficiently careful or the swizzle_ycck API is too loose.
-        if (((q == 0) || (q == 1)) && (src_width == 8)) {
-          want = 0x8080808000000000;
-        } else if (((q == 2) || (q == 3)) && (src_width == 4)) {
-          want = 0x8080808000000000;
-        } else if (((q == 2) || (q == 3)) && (src_width == 8)) {
-          want = 0x8080809C00000000;
-        } else if ((q == 4) || (q == 5)) {
-          want = 0x8080808000000000;
-        } else if (((q == 6) || (q == 7)) && (src_width == 4)) {
-          want = 0x8080808000000000;
-        } else if ((q == 6) && (dst_width == 4) && (src_width == 8)) {
-          want = 0x8080809C00000000;
-        }
-
         if (have != want) {
           RETURN_FAIL("q=%d, dst_width=%" PRIu32 ", src_width=%" PRIu32
                       ": have 0x%016" PRIX64 ", want 0x%016" PRIX64