[REVERTME] Temporarily fixed Klocwork issues.android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release

BZ: IMINAN-51481

Fixes: 38135184
Test: Netflix, play movies, youtube

Change-Id: I5ca1ed5561872efd7487ee2f3d456cf7260742b4
Signed-off-by: Austin Hu <austin.hu@intel.com>
(cherry picked from commit 542892afcf95dd2eb632c1b6139544b25cc6247b)

2 files changed, 9 insertions, 10 deletions

diff --git a/va/va.c b/va/va.c
index 3ea8503..f319e06 100755
--- a/va/va.c
+++ b/va/va.c
@@ -464,17 +464,14 @@ VAStatus vaInitialize (
     if ((VA_STATUS_SUCCESS == vaStatus) &&
         driver_name_env && (geteuid() == getuid())) {
         /* Don't allow setuid apps to use LIBVA_DRIVER_NAME */
-        if (driver_name) /* memory is allocated in va_getDriverName */
-            free(driver_name);
-        
-        driver_name = strdup(driver_name_env);
+        driver_name = "pvr";
         vaStatus = VA_STATUS_SUCCESS;
         va_infoMessage("User requested driver '%s'\n", driver_name);
     }
 
     if ((VA_STATUS_SUCCESS == vaStatus) && (driver_name != NULL)) {
         vaStatus = va_openDriver(dpy, driver_name);
-        va_infoMessage("va_openDriver() returns %d\n", vaStatus);
+        va_infoMessage("va_openDriver() returns %d, driver_name = %s\n", vaStatus, driver_name);
 
         *major_version = VA_MAJOR_VERSION;
         *minor_version = VA_MINOR_VERSION;
@@ -482,9 +479,6 @@ VAStatus vaInitialize (
         va_errorMessage("va_getDriverName() failed with %s,driver_name=%s\n",
                         vaErrorStr(vaStatus), driver_name);
 
-    if (driver_name)
-        free(driver_name);
-    
     VA_TRACE_LOG(va_TraceInitialize, dpy, major_version, minor_version);
 
     return vaStatus;
diff --git a/va/va_trace.c b/va/va_trace.c
index 4eda1ce..e63b7bf 100755
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -47,6 +47,8 @@
 #include <time.h>
 #include <errno.h>
 
+#define LIBVA_TRACE_FILE "/data/mediadrm/libva.log"
+
 /*
  * Env. to debug some issue, e.g. the decode/encode issue in a video conference scenerio:
  * .LIBVA_TRACE=log_file: general VA parameters saved into log_file
@@ -153,7 +155,9 @@ do {                                                    \
 
 void va_TraceInit(VADisplay dpy)
 {
-    char env_value[1024];
+    char env_value[1024] = {0};
+    // It's used to get value from libva.conf, just use to check value.
+    char va_value[1024] = {0};
     unsigned short suffix = 0xffff & ((unsigned int)time(NULL));
     FILE *tmp;    
     struct trace_context *trace_ctx = calloc(sizeof(struct trace_context), 1);
@@ -161,7 +165,8 @@ void va_TraceInit(VADisplay dpy)
     if (trace_ctx == NULL)
         return;
     
-    if (va_parseConfig("LIBVA_TRACE", &env_value[0]) == 0) {
+    if (va_parseConfig("LIBVA_TRACE", &va_value[0]) == 0) {
+        strcpy(env_value, LIBVA_TRACE_FILE);
         FILE_NAME_SUFFIX(env_value);
         trace_ctx->trace_log_fn = strdup(env_value);