Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
tg
Commits
8b78b6ff
Commit
8b78b6ff
authored
10 years ago
by
vysheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed merge structures.c
parent
4c0071cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
23 deletions
+7
-23
structures.c
structures.c
+7
-23
No files found.
structures.c
View file @
8b78b6ff
...
...
@@ -1482,29 +1482,13 @@ void fetch_encrypted_message_file (struct message_media *M) {
if
(
x
==
CODE_encrypted_file_empty
)
{
assert
(
M
->
type
!=
CODE_decrypted_message_media_photo
&&
M
->
type
!=
CODE_decrypted_message_media_video
);
}
else
{
assert
(
M
->
type
==
CODE_decrypted_message_media_document
||
M
->
type
==
CODE_decrypted_message_media_photo
||
M
->
type
==
CODE_decrypted_message_media_video
);
switch
(
M
->
type
)
{
case
CODE_decrypted_message_media_document
:
// Not at all sure these entries are correct.
// Especially since values are not fetched into structures rigidly for photo and video.
M
->
encr_document
.
id
=
fetch_long
();
M
->
encr_document
.
access_hash
=
fetch_long
();
M
->
encr_document
.
dc_id
=
fetch_int
();
M
->
encr_document
.
size
=
fetch_int
();
M
->
encr_document
.
key_fingerprint
=
fetch_int
();
break
;
case
CODE_decrypted_message_media_photo
:
case
CODE_decrypted_message_media_video
:
M
->
encr_photo
.
id
=
fetch_long
();
M
->
encr_photo
.
access_hash
=
fetch_long
();
fetch_int
();
//assert (M->encr_photo.size == fetch_int ());
//M->encr_photo.size = fetch_int (); // Why it is not the same?
M
->
encr_photo
.
dc_id
=
fetch_int
();
M
->
encr_photo
.
key_fingerprint
=
fetch_int
();
break
;
}
assert
(
M
->
type
==
CODE_decrypted_message_media_document
||
M
->
type
==
CODE_decrypted_message_media_photo
||
M
->
type
==
CODE_decrypted_message_media_video
||
M
->
type
==
CODE_decrypted_message_media_audio
);
M
->
encr_photo
.
id
=
fetch_long
();
M
->
encr_photo
.
access_hash
=
fetch_long
();
M
->
encr_photo
.
dc_id
=
fetch_int
();
M
->
encr_photo
.
size
=
fetch_int
();
M
->
encr_photo
.
key_fingerprint
=
fetch_int
();
}
}
...
...
This diff is collapsed.
Click to expand it.
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