Changeset 988 for vendor/current/source3/intl

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/intl/lang_tdb.c (modified) (5 diffs)

vendor/current/source3/intl/lang_tdb.c

@@ -104 +104 @@
         static int initialised;
         time_t loadtime;
-        bool result = False;
+        bool result = false;
+        char *dpath = NULL;
+        char *lpath = NULL;
 
         /* we only want to init once per process, unless given
@@ -131 +133 @@
                 return True;
 
-        if (asprintf(&msg_path, "%s.msg",
-                     data_path((const char *)lang)) == -1) {
+        dpath = data_path(talloc_tos(), (const char *)lang);
+        if (dpath == NULL) {
+                goto done;
+        }
+
+        if (asprintf(&msg_path, "%s.msg", dpath) == -1) {
                 DEBUG(0, ("asprintf failed\n"));
                 goto done;
@@ -142 +148 @@
                 goto done;
         }
-        
-        if (asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang) == -1) {
+
+        lpath = lock_path("lang_");
+        if (lpath == NULL) {
+                goto done;
+        }
+
+        if (asprintf(&path, "%s%s.tdb", lpath, lang) == -1) {
                 DEBUG(0, ("asprintf failed\n"));
                 goto done;
@@ -176 +187 @@
         SAFE_FREE(msg_path);
         SAFE_FREE(path);
+        TALLOC_FREE(lpath);
+        TALLOC_FREE(dpath);
 
         return result;
@@ -238 +251 @@
 {
         if (!tdb) return;
-        free((void *)msgstr);
+        free(discard_const_p(void, msgstr));
 }