From 32b82cd775c24a4a6517894c5be5061304f2e2f8 Mon Sep 17 00:00:00 2001 From: "amusil%netscape.com" Date: Tue, 20 Apr 1999 22:22:02 +0000 Subject: [PATCH] The number of variants should always start at 1. git-svn-id: svn://10.0.0.236/trunk@28336 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp | 10 +++++++--- mozilla/modules/plugin/nglsrc/nsPluginsDirWin.cpp | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp index d49ff833c9a..2e433e057d7 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp @@ -67,7 +67,7 @@ static char* GetKeyValue(char* verbuf, char* key) static PRUint32 CalculateVariantCount(char* mimeTypes) { - PRUint32 variants = 0; + PRUint32 variants = 1; char* index = mimeTypes; while (*index) { @@ -86,13 +86,17 @@ static char** MakeStringArray(PRUint32 variants, char* data) PRUint32 count = 0; buffer = (char **)PR_Malloc(variants * sizeof(char *)); - buffer[count++] = index; + if(!buffer) + return NULL; + buffer[count] = index; + ++count; while (*index && count