<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div class="elementToProof" style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
Hi Kamil,</div>
<div class="elementToProof" style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof" style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
> As glib is not available in Android, added local glib stub header to<br>
> build igt for Android.<br>
><br>
> Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com><br>
> Acked-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com><br>
> ---<br>
> tools/igt_dp_compliance.h | 4 ++++<br>
> tools/intel_pm_rpm.c | 4 ++++<br>
> tools/lsgpu.c | 4 ++++<br>
> 3 files changed, 12 insertions(+)<br>
<br>
> Same here, add some NULL handling to avoid NULL deref errors.<br>
<br>
In lsgpu.c, g_key_file_get_string is used and NULL deref case is handled properly.<br>
<br>
</div>
<div class="elementToProof" style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
Regards,<br>
Jeevaka<br>
<br>
><br>
> diff --git a/tools/igt_dp_compliance.h b/tools/igt_dp_compliance.h<br>
> index 5b1688039..226a13662 100644<br>
> --- a/tools/igt_dp_compliance.h<br>
> +++ b/tools/igt_dp_compliance.h<br>
> @@ -28,7 +28,11 @@<br>
> #include <stdio.h><br>
> #include <string.h><br>
> #include <stdlib.h><br>
> +#ifdef ANDROID<br>
> +#include "android/glib.h"<br>
> +#else<br>
> #include <glib.h><br>
> +#endif<br>
> <br>
> extern int drm_fd;<br>
> <br>
> diff --git a/tools/intel_pm_rpm.c b/tools/intel_pm_rpm.c<br>
> index 9622f0552..c1cc54b82 100644<br>
> --- a/tools/intel_pm_rpm.c<br>
> +++ b/tools/intel_pm_rpm.c<br>
> @@ -24,7 +24,11 @@<br>
> <br>
> #include <errno.h><br>
> #include <getopt.h><br>
> +#ifdef ANDROID<br>
> +#include "android/glib.h"<br>
> +#else<br>
> #include <glib.h><br>
> +#endif<br>
> #include <stdio.h><br>
> #include <stdlib.h><br>
> #include <string.h><br>
> diff --git a/tools/lsgpu.c b/tools/lsgpu.c<br>
> index e68390083..6cfbf3142 100644<br>
> --- a/tools/lsgpu.c<br>
> +++ b/tools/lsgpu.c<br>
> @@ -24,7 +24,11 @@<br>
> <br>
> #include <errno.h><br>
> #include <fcntl.h><br>
> +#ifdef ANDROID<br>
> +#include "android/glib.h"<br>
> +#else<br>
> #include <glib.h><br>
> +#endif<br>
> #include <libudev.h><br>
> #include <string.h><br>
> #include <signal.h><br>
> --<br>
> 2.49.0<br>
><br>
</div>
</body>
</html>