Add one vendor; fix crash

1 files changed, 5 insertions, 4 deletions

diff --git a/hardinfo2/vendor.c b/hardinfo2/vendor.c
index 005664ff..d36feb48 100644
--- a/hardinfo2/vendor.c
+++ b/hardinfo2/vendor.c
@@ -84,6 +84,7 @@ static const Vendor vendors[] = {
     {"Vimicro", "Vimicro", "www.vimicro.com"},
     {"OTi", "Ours Technology", "www.oti.com.tw"},
     {"BENQ", "BenQ", "www.benq.com"},
+    {"Acer", "Acer", "www.acer.com"},
     /* BIOS manufacturers */
     {"American Megatrends", "American Megatrends", "www.ami.com"},
     {"Award", "Award Software International", "www.award-bios.com"},
@@ -124,7 +125,7 @@ void vendor_init(void)
       if (g_key_file_load_from_file(vendors, path, 0, NULL)) {
         num_vendors = g_key_file_get_integer(vendors, "vendors", "number", NULL);
         
-        for (i = num_vendors; i >= 0; i--) {
+        for (i = num_vendors--; i >= 0; i--) {
           Vendor *v = g_new0(Vendor, 1);
           
           tmp = g_strdup_printf("vendor%d", i);
@@ -143,7 +144,7 @@ void vendor_init(void)
     } else {
       DEBUG("system-wise vendor.conf not found, using internal database");
       
-      for (i = G_N_ELEMENTS(vendors); i >= 0; i--) {
+      for (i = G_N_ELEMENTS(vendors) - 1; i >= 0; i--) {
         vendor_list = g_slist_prepend(vendor_list, (gpointer) &vendors[i]);
       }
     } 
@@ -163,7 +164,7 @@ const gchar *vendor_get_name(const gchar * id)
     for (vendor = vendor_list; vendor; vendor = vendor->next) {
       Vendor *v = (Vendor *)vendor->data;
       
-      if (v->id && id && strstr(id, v->id)) {
+      if (v && v->id && strstr(id, v->id)) {
         return g_strdup(v->name);
       }
     }
@@ -183,7 +184,7 @@ const gchar *vendor_get_url(const gchar * id)
     for (vendor = vendor_list; vendor; vendor = vendor->next) {
       Vendor *v = (Vendor *)vendor->data;
       
-      if (v->id && id && strstr(id, v->id)) {
+      if (v && v->id && strstr(id, v->id)) {
         return g_strdup(v->url);
       }
     }