commit 5625f424249db3abe302b931244192d536da8a53
author Frank Barchard <fbarchard@google.com> Thu Jan 18 13:37:29 2024 -0800
committer libyuv LUCI CQ <libyuv-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 18 21:56:11 2024 +0000
tree f7844b943c57a9a85d6b09d6ffede3293a969540
parent af6ac8265bbd07bcf977526458b60305c4304288

I444ToI420 and I422ToI420 check U and V pointers and return -1 if NULL.

- Add detect linux kernel version number in util/cpuid

adbrun -- blaze-bin/third_party/libyuv/cpuid
Kernel Version 4.14
Cpu Flags 0x7
Has ARM 0x2

Bug: libyuv:970
Change-Id: I655ed598db3655ca8448be08f1d71fbc328ced66
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5207990
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>

README.chromium

diff --git a/README.chromium b/README.chromium
index 1389f28..6488588 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: https://chromium.googlesource.com/libyuv/libyuv/
-Version: 1883
+Version: 1884
 License: BSD
 License File: LICENSE
 Shipped: yes

include/libyuv/version.h

diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index a9c5440..0de054c 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1883
+#define LIBYUV_VERSION 1884
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_

source/convert.cc

diff --git a/source/convert.cc b/source/convert.cc
index 6ac5bc4..2aa1865 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -55,7 +55,9 @@
   const int dst_uv_width = SUBSAMPLE(dst_y_width, 1, 1);
   const int dst_uv_height = SUBSAMPLE(dst_y_height, 1, 1);
   int r;
-  if (src_uv_width <= 0 || src_uv_height == 0) {
+  if ((!src_y && dst_y) || !src_u || !src_v || !dst_u || !dst_v ||
+      src_y_width <= 0 || src_y_height == 0 || src_uv_width <= 0 ||
+      src_uv_height == 0) {
     return -1;
   }
   if (dst_y) {

util/cpuid.c

diff --git a/util/cpuid.c b/util/cpuid.c
index c07e6e9..fa19fab 100644
--- a/util/cpuid.c
+++ b/util/cpuid.c
@@ -12,12 +12,34 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __linux__
+#include <ctype.h>
+#include <sys/utsname.h>
+#endif
+
 #include "libyuv/cpu_id.h"
 
 #ifdef __cplusplus
 using namespace libyuv;
 #endif
 
+#ifdef __linux__
+static void KernelVersion(int *version) {
+  struct utsname buffer;
+  int i = 0;
+
+  version[0] = version[1] = 0;
+  if (uname(&buffer) == 0) {
+    char *v = buffer.release;
+    for (i = 0; *v && i < 2; ++v) {
+      if (isdigit(*v)) {
+        version[i++] = (int) strtol(v, &v, 10);
+      }
+    }
+  }
+}
+#endif
+
 int main(int argc, const char* argv[]) {
   int cpu_flags = TestCpuFlag(-1);
   int has_arm = TestCpuFlag(kCpuHasARM);
@@ -28,6 +50,13 @@
   (void)argc;
   (void)argv;
 
+#ifdef __linux__
+  {
+    int kernelversion[2];
+    KernelVersion(kernelversion);
+    printf("Kernel Version %d.%d\n", kernelversion[0], kernelversion[1]);
+  }
+#endif
 #if defined(__i386__) || defined(__x86_64__) || \
     defined(_M_IX86) || defined(_M_X64)
   if (has_x86) {