mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix possible segfault

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
GetAway
2018-04-26 09:10:04 +02:00
committed by Thilo Graf
parent c7e6effcdf
commit eaf3e5c4b0
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
azbox/video.cpp
View File

@@ -158,7 +158,9 @@ int cVideo::setAspectRatio(int aspect, int mode)
/* { "panscan", "letterbox", "fullscreen", "14:9", "(unset)" } */ /* { "panscan", "letterbox", "fullscreen", "14:9", "(unset)" } */
static const char *m[] = { "1", "2", "0", "1", "(unset)" }; static const char *m[] = { "1", "2", "0", "1", "(unset)" };
int n; int n;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]);
int mo = (mode < 0||mode > 3) ? 4 : mode;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mo]);
if (aspect > 3 || aspect == 0) if (aspect > 3 || aspect == 0)
lt_info("%s: invalid aspect: %d\n", __func__, aspect); lt_info("%s: invalid aspect: %d\n", __func__, aspect);
@@ -173,8 +175,8 @@ int cVideo::setAspectRatio(int aspect, int mode)
if (mode == -1) if (mode == -1)
return 0; return 0;
lt_debug("%s: /proc/scalingmode -> %s\n", __func__, m[mode]); lt_debug("%s: /proc/scalingmode -> %s\n", __func__, m[mo]);
n = proc_put("/proc/scalingmode", m[mode], strlen(m[mode])); n = proc_put("/proc/scalingmode", m[mo], strlen(m[mo]));
if (n < 0) if (n < 0)
return 1; return 1;
return 0; return 0;

8
libarmbox/video.cpp
View File

@@ -365,7 +365,9 @@ int cVideo::setAspectRatio(int aspect, int mode)
// static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" }; // static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" };
static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" }; static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" };
int n; int n;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]);
int mo = (mode < 0||mode > 3) ? 4 : mode;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[mo]);
if (aspect > 3 || aspect == 0) if (aspect > 3 || aspect == 0)
lt_info("%s: invalid aspect: %d\n", __func__, aspect); lt_info("%s: invalid aspect: %d\n", __func__, aspect);
@@ -380,8 +382,8 @@ int cVideo::setAspectRatio(int aspect, int mode)
if (mode == -1) if (mode == -1)
return 0; return 0;
lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mode]); lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mo]);
n = proc_put("/proc/stb/video/policy", m[mode], strlen(m[mode])); n = proc_put("/proc/stb/video/policy", m[mo], strlen(m[mo]));
if (n < 0) if (n < 0)
return 1; return 1;
return 0; return 0;

8
libspark/video.cpp
View File

@@ -361,7 +361,9 @@ int cVideo::setAspectRatio(int aspect, int mode)
static const char *a[] = { "n/a", "4:3", "14:9", "16:9" }; static const char *a[] = { "n/a", "4:3", "14:9", "16:9" };
static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" }; static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" };
int n; int n;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]);
int mo = (mode < 0||mode > 3) ? 4 : mode;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[mo]);
if (aspect > 3 || aspect == 0) if (aspect > 3 || aspect == 0)
lt_info("%s: invalid aspect: %d\n", __func__, aspect); lt_info("%s: invalid aspect: %d\n", __func__, aspect);
@@ -376,8 +378,8 @@ int cVideo::setAspectRatio(int aspect, int mode)
if (mode == -1) if (mode == -1)
return 0; return 0;
lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mode]); lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mo]);
n = proc_put("/proc/stb/video/policy", m[mode], strlen(m[mode])); n = proc_put("/proc/stb/video/policy", m[mo], strlen(m[mo]));
if (n < 0) if (n < 0)
return 1; return 1;
return 0; return 0;