Attachment 24734 Details for Bug 61221

[patch] zinf-2.2.4-playlist.diff

zinf-2.2.4-playlist.diff (text/plain), 1.20 KB, created by Ludwig Nussel on 2004-10-07 21:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludwig Nussel

Created: 2004-10-07 21:34:17 UTC

Size: 1.20 KB

patch

obsolete

>Index: zinf-2.2.4/plm/playlist/pls/pls.cpp
>===================================================================
>--- zinf-2.2.4.orig/plm/playlist/pls/pls.cpp
>+++ zinf-2.2.4/plm/playlist/pls/pls.cpp
>@@ -106,6 +106,7 @@ Error PLS::ReadPlaylist(const char* url,
>     char   key[_MAX_PATH];
>     char   value[_MAX_PATH];
> //    char   root[_MAX_PATH];
>+    char   format[32];
> 
>     string path,file,root,title; //file,title,key,value,root;
>     
>@@ -132,6 +133,8 @@ Error PLS::ReadPlaylist(const char* url,
>     if(IsError(result))
>         return result;
> 
>+    snprintf(format, sizeof(format), "%%%d[^=]=%%%d[^\n\r] ", sizeof(key)-1, sizeof(value)-1);
>+
>     //strcpy(root, path);
>     root = path;
>     cp = strrchr(root.c_str(), DIR_MARKER);
>@@ -142,9 +145,9 @@ Error PLS::ReadPlaylist(const char* url,
>        return kError_FileNotFound;
>     len = -1;
>     while(!feof(fp)){
>-        if (fscanf(fp, " [%[^]]] ", key))
>+        if (fscanf(fp, " [%*[^]]] "))
>             continue;
>-        if (fscanf(fp, "%[^=]=%[^\n\r] ", key, value)){
>+        if (fscanf(fp, format, key, value)) {
>             if (strncmp(key, "File", 4) == 0){
>                 if (file.length()){
>                     AddItem(list, file, title, len, root);

Actions: View | Diff

Attachments on bug 61221: 24728 | 24733 | 24734 | 24735