Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch to vulnerability in pngpread.c file #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patch to vulnerability in pngpread.c file #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
359b578
Merge branch 'master' of https://github.com/dolphin-emu/dolphin
ElGHT Apr 4, 2021
4a1e4ae
Update WiiTDBs
ElGHT Apr 4, 2021
7fb879f
Update pngpread.c
gstrick2 Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 176 additions & 0 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
name: Merge

on:
schedule:
- cron: "0 0 * * *"

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Merge
shell: bash
run: |
# Git config
git config core.autocrlf false
git config core.ignorecase false
git config core.fscache true
git config diff.renameLimit 0
git config status.renameLimit 0
git config merge.renameLimit 0
git config http.postBuffer 1048576000
git config pack.threads 1
git config index.threads 0

# Fetch latest commits
git remote add dolphin-emu https://github.com/dolphin-emu/dolphin.git
git fetch --all
git reset --hard --recurse-submodule dolphin-emu/master
git clean -dffx
git submodule foreach git clean -dffx

# Who made the last commit and when?
export latest_committer_date="$(git log -1 --format=%cD)"
export latest_author_date="$(git log -1 --format=%aD)"
export latest_commit="$(git log -1 --format=%H)"

# Lets create our latest change in history first
git reset --hard 5f0c892ed0c280eb7fd56e9e2789b41b4ae8ee5a
git clean -dffx
export later_committer_date="$(git log -1 --format=%cD)"
export later_author_date="$(git log -1 --format=%aD)"
export later_author_email="$(git log -1 --format=%ae)"
export later_author_name="$(git log -1 --format=%an)"
export later_committer_email="$(git log -1 --format=%ce)"
export later_committer_name="$(git log -1 --format=%cn)"
export GIT_COMMITTER_DATE="$later_committer_date"
export GIT_AUTHOR_DATE="$later_author_date"
git -c user.name="$later_author_name" -c user.email="$later_author_email" revert --no-edit 5f0c892ed0c280eb7fd56e9e2789b41b4ae8ee5a
git -c user.name="$later_committer_name" -c user.email="$later_committer_email" commit --amend -m'Revert "Remove outdated documentation files"

This reverts commit 5f0c892ed0c280eb7fd56e9e2789b41b4ae8ee5a.'
export later_revert_commit="$(git log -1 --format=%H)"

# Create our second and earliest change in history
git reset --hard e81dd53b7ebc5e6dc12c714f749ab5ed457624df
git clean -dffx
export earlier_committer_date="$(git log -1 --format=%cD)"
export earlier_author_date="$(git log -1 --format=%aD)"
export earlier_author_email="$(git log -1 --format=%ae)"
export earlier_author_name="$(git log -1 --format=%an)"
export earlier_committer_email="$(git log -1 --format=%ce)"
export earlier_committer_name="$(git log -1 --format=%cn)"
export GIT_COMMITTER_DATE="$earlier_committer_date"
export GIT_AUTHOR_DATE="$earlier_author_date"
git -c user.name="$earlier_author_name" -c user.email="$earlier_author_email" revert --no-edit e81dd53b7ebc5e6dc12c714f749ab5ed457624df
git -c user.name="$earlier_committer_name" -c user.email="$earlier_committer_email" commit --amend -m'Revert "Remove an obsolete documentation file"

This reverts commit e81dd53b7ebc5e6dc12c714f749ab5ed457624df.'
export earlier_revert_commit="$(git log -1 --format=%H)"

# Move to the earliest point in history before we change it
git reset --hard 0c86634101fcb0de847c9b9d381486ed54383cc2
git clean -dffx

# Merge our second and earliest change in history
git -c user.name="$earlier_committer_name" -c user.email="$earlier_committer_email" merge --no-ff --no-edit $earlier_revert_commit
if [ "$(git log -1 --format=%H)" = "0c86634101fcb0de847c9b9d381486ed54383cc2" ]; then
exit 1
fi
git -c user.name="$earlier_committer_name" -c user.email="$earlier_committer_email" commit --amend -m"Merge branch 'master' of https://code.google.com/p/dolphin-emu"

# Merge up until our later change in history
export up_until_later_committer_date="$(git log -1 --format=%cD ca23318089a9bdcd9a7af93667dc30b1c73dc0e8)"
export up_until_later_author_date="$(git log -1 --format=%aD ca23318089a9bdcd9a7af93667dc30b1c73dc0e8)"
export up_until_later_author_email="$(git log -1 --format=%ae ca23318089a9bdcd9a7af93667dc30b1c73dc0e8)"
export up_until_later_author_name="$(git log -1 --format=%an ca23318089a9bdcd9a7af93667dc30b1c73dc0e8)"
export up_until_later_committer_email="$(git log -1 --format=%ce ca23318089a9bdcd9a7af93667dc30b1c73dc0e8)"
export up_until_later_committer_name="$(git log -1 --format=%cn ca23318089a9bdcd9a7af93667dc30b1c73dc0e8)"
export GIT_COMMITTER_DATE="$up_until_later_committer_date"
export GIT_AUTHOR_DATE="$up_until_later_author_date"
export current_point_in_history="$(git log -1 --format=%H)"
git -c user.name="$up_until_later_committer_name" -c user.email="$up_until_later_committer_email" merge --no-ff --no-edit ca23318089a9bdcd9a7af93667dc30b1c73dc0e8
if [ "$(git log -1 --format=%H)" = "$current_point_in_history" ]; then
exit 1
fi
git -c user.name="$up_until_later_committer_name" -c user.email="$up_until_later_committer_email" commit --amend -m"Merge branch 'master' of https://code.google.com/p/dolphin-emu"

# Merge our later change in history
export GIT_COMMITTER_DATE="$later_committer_date"
export GIT_AUTHOR_DATE="$later_author_date"
export current_point_in_history="$(git log -1 --format=%H)"
git -c user.name="$later_committer_name" -c user.email="$later_committer_email" merge --no-ff --no-edit $later_revert_commit
if [ "$(git log -1 --format=%H)" = "$current_point_in_history" ]; then
exit 1
fi
git -c user.name="$later_committer_name" -c user.email="$later_committer_email" commit --amend -m"Merge branch 'master' of https://code.google.com/p/dolphin-emu"
export changed_files_merge="$(git log -1 --format=%H)"

# Move back to the earliest point in history before we change it again
git reset --hard 0c86634101fcb0de847c9b9d381486ed54383cc2
git clean -dffx

# Merge the changed history
git -c user.name="$up_until_later_committer_name" -c user.email="$up_until_later_committer_email" merge --no-ff --no-edit $changed_files_merge
if [ "$(git log -1 --format=%H)" = "0c86634101fcb0de847c9b9d381486ed54383cc2" ]; then
exit 1
fi
git -c user.name="$up_until_later_committer_name" -c user.email="$up_until_later_committer_email" commit --amend -m"Merge branch 'master' of https://code.google.com/p/dolphin-emu"
# Save the resulting merge
export changed_history_merge="$(git log -1 --format=%H)"

# Move back to the earliest point in history before we change it again
git reset --hard 0c86634101fcb0de847c9b9d381486ed54383cc2
git clean -dffx

# Merge the changed history merge
git -c user.name="8" -c user.email="[email protected]" merge --no-ff --no-edit $changed_history_merge
if [ "$(git log -1 --format=%H)" = "0c86634101fcb0de847c9b9d381486ed54383cc2" ]; then
exit 1
fi
git -c user.name="8" -c user.email="[email protected]" commit --amend -m"Merge branch 'master' of https://github.com/dolphin-emu/dolphin"
# Save the resulting merge
export new_history_merge="$(git log -1 --format=%H)"

# Merge 5.0
export major_version_committer_date="$(git log -1 --format=%cD ac267a29405ae768037a8774b84b805a4180d1af)"
export major_version_author_date="$(git log -1 --format=%aD ac267a29405ae768037a8774b84b805a4180d1af)"
export GIT_COMMITTER_DATE="$major_version_committer_date"
export GIT_AUTHOR_DATE="$major_version_author_date"
git -c user.name="8" -c user.email="[email protected]" merge --no-ff --no-edit ac267a29405ae768037a8774b84b805a4180d1af
if [ "$(git log -1 --format=%H)" = $new_history_merge ]; then
exit 1
fi
git -c user.name="8" -c user.email="[email protected]" commit --amend -m"Merge branch 'master' of https://github.com/dolphin-emu/dolphin"
# Save the resulting merge
export new_history_merge="$(git log -1 --format=%H)"

# GitHub Actions
git checkout origin/master -- .github/workflows/merge.yml
git add .github/workflows/merge.yml
git -c user.name="8" -c user.email="[email protected]" commit -m"GitHub Actions"

# Merge the rest of the history so we're up-to-date
export GIT_COMMITTER_DATE="$latest_committer_date"
export GIT_AUTHOR_DATE="$latest_author_date"
git -c user.name="8" -c user.email="[email protected]" merge --no-ff --no-edit $latest_commit
if [ "$(git log -1 --format=%H)" = $new_history_merge ]; then
exit 1
fi
git -c user.name="8" -c user.email="[email protected]" commit --amend -m"Merge branch 'master' of https://github.com/dolphin-emu/dolphin"

# Update WiiTDBs
bash Tools/update-wiitdb.sh

# Remove timestamps
sed -i '1d' Data/Sys/wiitdb-*.txt

# Commit WiiTDBs
git add Data/Sys/wiitdb-*.txt
git -c user.name="8" -c user.email="[email protected]" commit -m"Update WiiTDBs"
- uses: ad-m/github-push-action@master
with:
branch: "refs/heads/master"
force: true
github_token: ${{ secrets.GITHUB_TOKEN }}
33 changes: 19 additions & 14 deletions Data/Sys/wiitdb-de.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
TITLES = https://www.gametdb.com (type: Wii language: DE_unique version: 20191106234221)
R22J01 = FlingSmash
R23P52 = Barbie und Die Drei Musketiere
R25PWR = LEGO Harry Potter: Die Jahre 1-4
Expand All @@ -19,6 +18,7 @@ R4LXUG = Schweine Party
R4PP69 = Die Sims 2: Haustiere
R4ZJ01 = Fatal Frame 4: Mask of the Lunar Eclipse
R55P41 = Wer wird Millionär
R59D4Q = Club Penguin: Game Day!
R5AP8P = Der Goldene Kompass
R5AX8P = Der Goldene Kompass
R5FP41 = Academy of Champions: Fussball
Expand All @@ -30,6 +30,7 @@ R5QPGT = Zirkus
R5UP41 = CSI: Tödliche Absichten
R5VP41 = James Cameron's Avatar: Das Spiel
R5VX41 = James Cameron's Avatar: Das Spiel
R5XJ13 = MySims Agents
R6APPU = Mein Baby und ich
R6MPML = America´s Next Top Model
R6WP68 = AMF Bowling: World Lanes
Expand Down Expand Up @@ -107,6 +108,7 @@ RGHP52 = Guitar Hero III: Legends Of Rock
RGJP7U = George Der aus dem Dschungel kam
RGQE70 = Ghostbusters: Das Videospiel
RGQP70 = Ghostbusters: Das Videospiel
RGZP70 = Godzilla Unle고질라 봉인 해제ashed
RH5PKM = Horse Life: Freunde für immer
RH6P69 = Harry Potter und der Halbblutprinz
RHKP18 = Job Island
Expand All @@ -123,9 +125,9 @@ RIBPKM = Igor: Das Spiel
RIHP8P = Der unglaubliche Hulk
RIJP69 = G.I. Joe: Geheimauftrag Cobra
RIOPSU = Schauderhafte Geschichten: Skrupellose Römer
RIPPAF = One Piece Unlimited Cruise 1 - Der Schatz unter den Wellen
RIPPAF = One Piece: Unlimited Cruise 1: Der Schatz unter den Wellen
RIRP8P = Iron Man: The Video Game
RIUPAF = One Piece Unlimited Cruise 2: Das Erwachen eines Helden
RIUPAF = One Piece: Unlimited Cruise 2: Das Erwachen eines Helden
RJ2P52 = 007: Ein Quantum Trost
RJ8P64 = Indiana Jones und der Stab der Könige
RJ9PFR = Think Logic Trainer - Training für Körper und Geist
Expand Down Expand Up @@ -169,7 +171,7 @@ ROJP52 = Rapala: Angel-Spaß
ROLP8P = Mario & Sonic bei den Olympischen Winterspielen
ROPP41 = Jagdfieber
ROTP7J = Twin Strike: Operation Thunderstorm
ROUPAF = One Piece Unlimited Cruise 1: Der Schatz unter den Wellen
ROUPAF = One Piece: Unlimited Cruise 1: Der Schatz unter den Wellen
ROVPHM = Playmobil Circus: Manege frei!
ROYP41 = Wolkig Mit Aussicht Auf Fleischbällchen: Das Videospiel
ROYX41 = Wolkig mit Aussicht auf Fleischbällchen
Expand Down Expand Up @@ -301,6 +303,7 @@ S7BP69 = Trivial Pursuit: Wetten & Gewinnen
S7FPGT = Zumba Kids: Die ultimate Zumba tanz-party
S7SP41 = Die Schlümpfe Party Pack
SA3P5G = Alvin und Die Chipmunks 3: Chip Brunch
SA3XGT = Alvin und Die Chipmunks 3: Chip Brunch
SALP4Q = Alice Im Wunderland
SAOP78 = Monster High: Monsterkrasse Highschool-Klasse!
SAOXVZ = Monster High: Monsterkrasse Highschool-Klasse!
Expand Down Expand Up @@ -397,7 +400,6 @@ SSCFWR = Scene It? Ganz großes Kino!
SSCIWR = Scene It? Ganz großes Kino!
SSCPWR = Scene It? Ganz großes Kino!
SSCSWR = Scene It? Ganz großes Kino!
SSEDNG = We Sing Vol. 2
SSEPNG = We Sing Vol. 2
SSHPHH = Sherlock Holmes: Das Geheimnis des silbernen Ohrrings
ST5P52 = Transformers: Mission auf Cybertron
Expand All @@ -414,6 +416,7 @@ SV3PAF = Madagascar 3: Flucht durch Europa
SV7PVZ = Die Pinguine aus Madagascar
SVDP52 = Spongebob Schwammkopf: Planktons Fiese Robo-Rache
SVMP01 = Super Mario All-Stars: 25 Jahre Jubiläumsedition
SVQEVZ = Barbie und ihre Schwestern: Die Rettung der Welpen
SVQPVZ = Barbie und ihre Schwestern: Die Rettung der Welpen
SVVPAF = Die Croods: Steinzeit Party!
SW3PKM = Eurosport Winter Stars
Expand Down Expand Up @@ -477,6 +480,7 @@ HAGE = Nachrichtenkanal
HAGP = Nachrichtenkanal
HAPP = Mii-Wettbewerbskanal
HAYA = Fotokanal
G2FD78 = Tak 2: Der Stab der Träume
G3AD69 = Der Herr der Ringe: Das dritte Zeitalter
G3DX6L = Carmen Sandiego: Das Geheimnis der gestohlenen Trommeln
G3MP41 = Der Anschlag
Expand All @@ -488,27 +492,27 @@ G6FD69 = FIFA Fussball-Weltmeisterschaft 2006
G8MP01 = Paper Mario: Die Legende Vom Äonentor
G9TD52 = Grosse Haie: Kleine Fische
GAZD69 = Harry Potter und der Gefangene von Askaban
GC3D78 = Scooby-Doo!: Fluch der Folianten
GCBP7D = Crash Bandicoot: Der Zorn Des Cortex
GC3D78 = Scooby-Doo! Fluch der Folianten
GCBP7D = Crash Bandicoot: Der Zorn des Cortex
GCGP41 = 3 Engel Für Charlie: Volle Power
GCIP69 = Die Sims
GCQD7D = Buffy im Bann der Dämonen: Chaos Bleeds
GDIX7D = Die Hard - Stirb Langsam: Vendetta
GDKPA4 = Disney´s Sports Fußball
GDOP41 = Disney's Donald Duck Phantomias: Platyrhynchos Kineticus
GEND69 = James Bond 007: Alles Oder Nichts
GENP69 = 007: Alles Oder Nichts
GF4D52 = Die Fantastischen Vier
GFAD69 = FIFA Football 2003
GFSD69 = FIFA Fussball Weltmeisterschaft 2002
GGVD78 = Der SpongBob Schwammkopf Film
GGVD78 = SpongBob Schwammkopf: Der Film
GH4D69 = Harry Potter und der Feuerkelch
GH5D52 = Ab Durch Die Hecke
GHBP7D = Der Hobbit
GHCD4Q = Himmel und Huhn
GHLY69 = Harry Potter und der Stein der Weisen
GHSY69 = Harry Potter Und Die Kammer Des Schreckens
GHSY69 = Harry Potter und die Kammer des Schreckens
GHVP08 = Disney's Tricky Micky
GIAP7D = Ice Age 2 : Jetzt Taut's
GIAP7D = Ice Age 2: Jetzt Taut's
GICD78 = Die Unglaublichen
GIHD78 = Scooby-Doo! Nacht der 100 Schrecken
GIQY78 = Die Unglaublichen: Der Angriff Des Tunnelgräbers
Expand All @@ -521,8 +525,9 @@ GL5X4F = Lego Star Wars : Das Videospiel
GL7P64 = LEGO Star Wars II: Die klassische Trilogie
GLCD52 = Lemony Snicket: Rätselhafte Ereignisse
GLHPG9 = Flutsch und weg
GLOD69 = Der Herr Der Ringe: Die Zwei Türme
GLOD69 = Der Herr der Ringe: Die zwei Türme
GLVD4Q = Die Chroniken von Narnia: Der König von Narnia
GLVP4Q = Die Chroniken von Narnia: Der König von Narnia
GLZD69 = 007: Liebesgrüsse aus Moskau
GMNP78 = Die Monster AG : Monster Ball
GNED78 = Findet Nemo
Expand All @@ -533,8 +538,8 @@ GPHD52 = Pitfall: Die verlorene Expedition
GPLD9G = Disney's Ferkels Grosses Abenteuer - Spiel
GPQP6L = The Powerpuff Girls: Kampf den Gurkenschurken
GPXP01 = Pokémon Box: Rubin & Saphir
GQ4D78 = SpongeBob Schwammkopf: Die Kreatur aus der krossen Krabbe
GQQD78 = Nickelodeon SpongeBob Schwammkopf: Film ab!
GQ4D78 = SpongeBob Schwammkopf: Die Kreatur aus der Krossen Krabbe
GQQD78 = SpongeBob Schwammkopf: Film ab!
GQWX69 = Harry Potter: Quidditch - Weltmeisterschaft
GR9P6L = Die Herrschaft Des Feuers
GSKP7D = The Scorpion King : Aufstieg des Akkadiers
Expand Down
Loading