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
e139c96c
Commit
e139c96c
authored
Aug 22, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/open: added missing sanity checks
parent
8564f347
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+13
-4
No files found.
modules/gui/macosx/open.m
View file @
e139c96c
...
@@ -860,10 +860,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
...
@@ -860,10 +860,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
NULL
,
NULL
,
NULL
NULL
);
);
if
(
noErr
==
err
)
{
if
(
noErr
==
err
)
actualVolume
=
catalogInfo
.
volume
;
actualVolume
=
catalogInfo
.
volume
;
else
return
@""
;
}
}
}
else
return
@""
;
GetVolParmsInfoBuffer
volumeParms
;
GetVolParmsInfoBuffer
volumeParms
;
err
=
FSGetVolumeParms
(
actualVolume
,
&
volumeParms
,
sizeof
(
volumeParms
)
);
err
=
FSGetVolumeParms
(
actualVolume
,
&
volumeParms
,
sizeof
(
volumeParms
)
);
...
@@ -893,10 +896,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
...
@@ -893,10 +896,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
NULL
,
NULL
,
NULL
NULL
);
);
if
(
noErr
==
err
)
{
if
(
noErr
==
err
)
actualVolume
=
catalogInfo
.
volume
;
actualVolume
=
catalogInfo
.
volume
;
else
return
NULL
;
}
}
}
else
return
NULL
;
GetVolParmsInfoBuffer
volumeParms
;
GetVolParmsInfoBuffer
volumeParms
;
err
=
FSGetVolumeParms
(
actualVolume
,
&
volumeParms
,
sizeof
(
volumeParms
)
);
err
=
FSGetVolumeParms
(
actualVolume
,
&
volumeParms
,
sizeof
(
volumeParms
)
);
...
@@ -904,6 +910,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
...
@@ -904,6 +910,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
CFMutableDictionaryRef
matchingDict
;
CFMutableDictionaryRef
matchingDict
;
io_service_t
service
;
io_service_t
service
;
if
(
!
volumeParms
.
vMDeviceID
)
return
NULL
;
matchingDict
=
IOBSDNameMatching
(
kIOMasterPortDefault
,
0
,
volumeParms
.
vMDeviceID
);
matchingDict
=
IOBSDNameMatching
(
kIOMasterPortDefault
,
0
,
volumeParms
.
vMDeviceID
);
service
=
IOServiceGetMatchingService
(
kIOMasterPortDefault
,
matchingDict
);
service
=
IOServiceGetMatchingService
(
kIOMasterPortDefault
,
matchingDict
);
...
...
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