Merged branch JAVADEV_PR3_20001002 into trunk.

git-svn-id: svn://10.0.0.236/trunk@82247 18797224-902f-48f8-a5cc-f745e15eee43
2000-11-02 23:33:21 +00:00
parent 19a05b26cb
commit aee4ebbf93
71 changed files with 1537 additions and 521 deletions
--- a/mozilla/java/plugins/src/PlugletFactory.cpp
+++ b/mozilla/java/plugins/src/PlugletFactory.cpp
@@ -179,7 +179,7 @@ int PlugletFactory::Compare(const char *mimeType) {
    char *p1 = mimeDescription;
    char *p2 = strchr(p1,';');
    while ( p1 != NULL && p1 < terminator ) {
-        size_t n = sizeof(char) * ( ( (p2 == NULL) ? terminator : p2) - p1 );
+        size_t n = sizeof(char) * ( ( (p2 == NULL || p2 > terminator) ? terminator : p2) - p1 );
        if (PL_strncasecmp(p1,mimeType,n) == 0) {
            return 1;
        }