Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
30afde38
Commit
30afde38
authored
Nov 28, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: try to fix CDDB crash on Windows
Ref #3804
parent
d3fbc3d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
extras/contrib/src/Patches/libcddb-getenv-crash.patch
extras/contrib/src/Patches/libcddb-getenv-crash.patch
+23
-0
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+1
-0
No files found.
extras/contrib/src/Patches/libcddb-getenv-crash.patch
0 → 100644
View file @
30afde38
--- libcddb/lib/cddb_conn.c 2006-10-15 13:53:11.000000000 +0200
+++ libcddb.new/lib/cddb_conn.c 2010-11-28 21:03:39.012749230 +0100
@@ -100,9 +100,17 @@
c->use_cache = CACHE_ON;
/* construct cache dir '$HOME/[DEFAULT_CACHE]' */
s = getenv("HOME");
- c->cache_dir = (char*)malloc(strlen(s) + 1 + sizeof(DEFAULT_CACHE) + 1);
- sprintf(c->cache_dir, "%s/%s", s, DEFAULT_CACHE);
- c->cache_read = FALSE;
+ if( s )
+ {
+ c->cache_dir = (char*)malloc(strlen(s) + 1 + sizeof(DEFAULT_CACHE) + 1);
+ sprintf(c->cache_dir, "%s/%s", s, DEFAULT_CACHE);
+ c->cache_read = FALSE;
+ }
+ else
+ {
+ c->cache_dir = NULL;
+ c->use_cache = CACHE_OFF;
+ }
/* use anonymous@localhost */
c->user = strdup(DEFAULT_USER);
extras/contrib/src/contrib-src.mak
View file @
30afde38
...
...
@@ -1515,6 +1515,7 @@ endif
ifdef
HAVE_WIN32
(
cd
$@
;
patch
-p0
< ../Patches/libcddb-win32.patch
)
endif
patch
-p0
< Patches/libcddb-getenv-crash.patch
ifdef
HAVE_WIN32
.cddb
:
libcddb .regex
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment