gettext.c: 'search' is now a fixed length string buffer.

Memory allocation issues were causing WebCit to crash in some situations.

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 6e69ca47eb21133ae56e21d62520084b13eeb959..3d86008f4997502efe65c8c9cafb7712cd015218 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -54,15 +54,14 @@ void httplang_to_locale(char *LocaleString)
 
        int i = 0;
        int j = 0;
-       size_t len = strlen(LocaleString);
+       /* size_t len = strlen(LocaleString); */
        long prio;
        int av;
        int nBest;
        int nParts;
-       char *search = (char *) malloc(len);
+       char search[1024];
        
-       memcpy(search, LocaleString, len);
-       search[len] = '\0';
+       safestrncpy(search, LocaleString, sizeof search);
        nParts=num_tokens(search,',');
        for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
         {
@@ -129,25 +128,23 @@ void httplang_to_locale(char *LocaleString)
        prio=0;
        av=-1000;
        nBest=-1;
-       for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
-               {
-                       ls=&wanted_locales[i];
-                       if ((ls->availability<=0)&& 
-                               (av<ls->availability)&&
-                               (prio<ls->priority)&&
-                               (ls->selectedlang!=-1)){
-                               nBest=ls->selectedlang;
-                               av=ls->availability;
-                               prio=ls->priority;
-                       }
+       for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++) {
+               ls=&wanted_locales[i];
+               if ((ls->availability<=0)&& 
+                  (av<ls->availability)&&
+                  (prio<ls->priority)&&
+                  (ls->selectedlang!=-1)) {
+                       nBest=ls->selectedlang;
+                       av=ls->availability;
+                       prio=ls->priority;
                }
-       if (nBest==-1) /** fall back to C */
+       }
+       if (nBest == -1) {
+               /** fall back to C */
                nBest=0;
+       }
        WC->selected_language=nBest;
        lprintf(9, "language found: %s\n", AvailLang[WC->selected_language]);
-       if (search != NULL) {
-               free(search);
-       }
 }
 
 /* TODO: we skip the language weightening so far. */