[Libreoffice-commits] core.git: Branch 'feature/gsoc15-online-update' - onlineupdate/Executable_mar.mk onlineupdate/source

[Nathan Yee]

 onlineupdate/Executable_mar.mk                |    5 ++++-
 onlineupdate/source/libmar/sign/nss_secutil.c |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 7a736718069f8d88743ffc6f51b7f59558db54e9
Author: Nathan Yee <ny.nathan....@gmail.com>
Date:   Tue Aug 18 15:20:37 2015 -0700

    Revert strdup to PL_strdup in nss_secutil.c
    
    Change-Id: Iec4ae361831f9002cf4317c0bd4c2d365c20282a
    Reviewed-on: https://gerrit.libreoffice.org/17847
    Reviewed-by: Jacobo Aragunde Pérez <jaragu...@igalia.com>
    Tested-by: Jacobo Aragunde Pérez <jaragu...@igalia.com>

diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk
index 7a42b3c..6ac1af1 100644
--- a/onlineupdate/Executable_mar.mk
+++ b/onlineupdate/Executable_mar.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_Executable_add_libs,mar,\
 ))
 endif
 
-$(eval $(call gb_Executable_use_externals,mar,nss3))
+$(eval $(call gb_Executable_use_externals,mar,\
+       nss3 \
+       plc4 \
+))
 
 $(eval $(call gb_Executable_add_cobjects,mar,\
        onlineupdate/source/libmar/src/mar_create \
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c 
b/onlineupdate/source/libmar/sign/nss_secutil.c
index ac8954c..1f89cbf 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -214,7 +214,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, 
void *arg)
    */
   pw = SECU_FilePasswd(slot, retry, pwdata->data);
   pwdata->source = PW_PLAINTEXT;
-  pwdata->data = strdup(pw);
+  pwdata->data = PL_strdup(pw);
   /* it's already been dup'ed */
   return pw;
     case PW_EXTERNAL:
@@ -228,7 +228,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, 
void *arg)
   }
       /* Fall Through */
     case PW_PLAINTEXT:
-  return strdup(pwdata->data);
+  return PL_strdup(pwdata->data);
     default:
   break;
     }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits